diff options
| author | Alex Vakulenko <avakulenko@chromium.org> | 2014-06-16 17:18:44 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-06-18 08:46:04 +0000 |
| commit | 8a5322984f2d81bcbfd8d44c59747a11bd9b904b (patch) | |
| tree | 691f393705f4aa8b6e2476817e1046f6e572efca /property_store.h | |
| parent | 45170bcb5e3b5e076e9307c695faf25faac395c8 (diff) | |
| download | shill-8a5322984f2d81bcbfd8d44c59747a11bd9b904b.tar.gz | |
shill: Fix most of warnings from cpplint
Fix most cpplinter's warnings. On a few occasisions, the warnings
produced were false-positives, so added explicit // NOLINT comment
overrides.
There were a few instances of disallowed non-const reference usage
(reported as runtime/reference error by cpplint) for
"DBus::Error &error" which should potentially be changed
to pointers to comply with C++ coding style but I will let Shill
owners do that since there is quite a few of those and the
change isn't brain-dead simple...
BUG=None
TEST=platform2 still compiles and all unit tests pass.
Change-Id: Ic2e31896aa13d20eeb1a85dee74f3db8cccfde2e
Reviewed-on: https://chromium-review.googlesource.com/204164
Tested-by: Alex Vakulenko <avakulenko@chromium.org>
Reviewed-by: mukesh agrawal <quiche@chromium.org>
Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
Diffstat (limited to 'property_store.h')
| -rw-r--r-- | property_store.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/property_store.h b/property_store.h index 326cf04f..cf4eb0b7 100644 --- a/property_store.h +++ b/property_store.h @@ -135,7 +135,7 @@ class PropertyStore { // // |name| is the key used to access the property. If the property // cannot be cleared, |error| is set, and the method returns false. - // Otherwrise, |error| is unchanged, and the method returns true. + // Otherwise, |error| is unchanged, and the method returns true. virtual bool ClearProperty(const std::string &name, Error *error); // Accessors for iterators over property maps. Useful for dumping all @@ -143,12 +143,12 @@ class PropertyStore { ReadablePropertyConstIterator<bool> GetBoolPropertiesIter() const; ReadablePropertyConstIterator<int16> GetInt16PropertiesIter() const; ReadablePropertyConstIterator<int32> GetInt32PropertiesIter() const; - ReadablePropertyConstIterator<KeyValueStore> GetKeyValueStorePropertiesIter( - ) const; - ReadablePropertyConstIterator<RpcIdentifier> GetRpcIdentifierPropertiesIter( - ) const; - ReadablePropertyConstIterator<RpcIdentifiers> GetRpcIdentifiersPropertiesIter( - ) const; + ReadablePropertyConstIterator<KeyValueStore> + GetKeyValueStorePropertiesIter() const; + ReadablePropertyConstIterator<RpcIdentifier> + GetRpcIdentifierPropertiesIter() const; + ReadablePropertyConstIterator<RpcIdentifiers> + GetRpcIdentifiersPropertiesIter() const; ReadablePropertyConstIterator<std::string> GetStringPropertiesIter() const; ReadablePropertyConstIterator<Stringmap> GetStringmapPropertiesIter() const; ReadablePropertyConstIterator<Stringmaps> GetStringmapsPropertiesIter() const; @@ -232,7 +232,7 @@ class PropertyStore { const std::string &name, V *value, Error *error, - const std::map< std::string, std::tr1::shared_ptr< + const std::map< std::string, std::shared_ptr< AccessorInterface<V> > > &collection, const std::string &value_type_english) const; @@ -241,7 +241,7 @@ class PropertyStore { const std::string &name, const V &value, Error *error, - std::map< std::string, std::tr1::shared_ptr< AccessorInterface<V> > > &, + std::map< std::string, std::shared_ptr< AccessorInterface<V> > > *, const std::string &value_type_english); // These are std::maps instead of something cooler because the common |