diff options
author | philip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c> | 2012-05-23 09:20:57 +0000 |
---|---|---|
committer | philip.liard@gmail.com <philip.liard@gmail.com@ee073f10-1060-11df-b6a4-87a95322a99c> | 2012-05-23 09:20:57 +0000 |
commit | c1b63c89b2a1bd6d58893f860c2899b4d3dc375c (patch) | |
tree | 51a183bad3604ed6d8d19bde32960d7052539c7e | |
parent | a6eef04c15f45d5916ee3429d24665c49148b99b (diff) | |
download | phonenumbers-c1b63c89b2a1bd6d58893f860c2899b4d3dc375c.tar.gz |
CPP: Make cpplint happy with stringutils.*
Patch contributed by pmezard.
git-svn-id: http://libphonenumber.googlecode.com/svn/trunk/cpp/src/phonenumbers@457 ee073f10-1060-11df-b6a4-87a95322a99c
-rw-r--r-- | stringutil.cc | 28 | ||||
-rw-r--r-- | stringutil.h | 12 |
2 files changed, 20 insertions, 20 deletions
diff --git a/stringutil.cc b/stringutil.cc index f455df9..01db9eb 100644 --- a/stringutil.cc +++ b/stringutil.cc @@ -27,7 +27,7 @@ namespace phonenumbers { using std::equal; using std::stringstream; -string operator+(const string& s, int n) { +string operator+(const string& s, int n) { // NOLINT(runtime/string) stringstream stream; stream << s << n; @@ -171,23 +171,23 @@ int GlobalReplaceSubstring(const string& substring, // StringHolder class -StringHolder::StringHolder(const string& s) : - string_(&s), - cstring_(NULL), - len_(s.size()) +StringHolder::StringHolder(const string& s) + : string_(&s), + cstring_(NULL), + len_(s.size()) {} -StringHolder::StringHolder(const char* s) : - string_(NULL), - cstring_(s), - len_(std::strlen(s)) +StringHolder::StringHolder(const char* s) + : string_(NULL), + cstring_(s), + len_(std::strlen(s)) {} -StringHolder::StringHolder(uint64 n) : - converted_string_(SimpleItoa(n)), - string_(&converted_string_), - cstring_(NULL), - len_(converted_string_.length()) +StringHolder::StringHolder(uint64 n) + : converted_string_(SimpleItoa(n)), + string_(&converted_string_), + cstring_(NULL), + len_(converted_string_.length()) {} StringHolder::~StringHolder() {} diff --git a/stringutil.h b/stringutil.h index c4f3a6f..48a256c 100644 --- a/stringutil.h +++ b/stringutil.h @@ -30,7 +30,7 @@ using std::string; using std::vector; // Supports string("hello") + 10. -string operator+(const string& s, int n); +string operator+(const string& s, int n); // NOLINT(runtime/string) // Converts integer to string. string SimpleItoa(uint64 n); @@ -76,11 +76,11 @@ int GlobalReplaceSubstring(const string& substring, const string& replacement, // Holds a reference to a std::string or C string. It can also be constructed // from an integer which is converted to a string. class StringHolder { -public: + public: // Don't make the constructors explicit to make the StrCat usage convenient. - StringHolder(const string& s); - StringHolder(const char* s); - StringHolder(uint64 n); + StringHolder(const string& s); // NOLINT(runtime/explicit) + StringHolder(const char* s); // NOLINT(runtime/explicit) + StringHolder(uint64 n); // NOLINT(runtime/explicit) ~StringHolder(); const string* GetString() const { @@ -95,7 +95,7 @@ public: return len_; } -private: + private: const string converted_string_; // Stores the string converted from integer. const string* const string_; const char* const cstring_; |