diff options
author | Jeff Davidson <jpd@google.com> | 2015-01-20 10:18:05 -0800 |
---|---|---|
committer | Jeff Davidson <jpd@google.com> | 2015-01-20 10:18:05 -0800 |
commit | 0ddac1f3791efefb2cffdb425f0c600feb7a47e6 (patch) | |
tree | efeab8fb69198186f1dabfe43d341c7b70c9c5f1 /gtest/samples/sample2.h | |
parent | 77a6b2f4cdd580d57630f079db1d908d7fd90a54 (diff) | |
download | external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.zip external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.tar.gz external_protobuf-0ddac1f3791efefb2cffdb425f0c600feb7a47e6.tar.bz2 |
Update protobuf's gtest to expected version.
Generated by running:
rm -rf gtest
./autogen.sh
./configure
Change-Id: I5d9c0bea09dd9d3e4d7d4442dd8222011f5c522a
Diffstat (limited to 'gtest/samples/sample2.h')
-rw-r--r-- | gtest/samples/sample2.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtest/samples/sample2.h b/gtest/samples/sample2.h index c5f3b8c..5b57e60 100644 --- a/gtest/samples/sample2.h +++ b/gtest/samples/sample2.h @@ -40,13 +40,13 @@ // A simple string class. class MyString { private: - const char * c_string_; + const char* c_string_; const MyString& operator=(const MyString& rhs); public: // Clones a 0-terminated C string, allocating memory using new. - static const char * CloneCString(const char * c_string); + static const char* CloneCString(const char* a_c_string); //////////////////////////////////////////////////////////// // @@ -56,8 +56,8 @@ class MyString { MyString() : c_string_(NULL) {} // Constructs a MyString by cloning a 0-terminated C string. - explicit MyString(const char * c_string) : c_string_(NULL) { - Set(c_string); + explicit MyString(const char* a_c_string) : c_string_(NULL) { + Set(a_c_string); } // Copy c'tor @@ -72,14 +72,14 @@ class MyString { ~MyString() { delete[] c_string_; } // Gets the 0-terminated C string this MyString object represents. - const char * c_string() const { return c_string_; } + const char* c_string() const { return c_string_; } size_t Length() const { return c_string_ == NULL ? 0 : strlen(c_string_); } // Sets the 0-terminated C string this MyString object represents. - void Set(const char * c_string); + void Set(const char* c_string); }; |