diff options
| author | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
|---|---|---|
| committer | Feng Xiao <xfxyjwf@gmail.com> | 2018-08-08 17:00:41 -0700 |
| commit | 6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3 (patch) | |
| tree | e575738adf52d24b883cca5e8928a5ded31caba1 /src/google/protobuf/arenastring_unittest.cc | |
| parent | e7746f487cb9cca685ffb1b3d7dccc5554b618a4 (diff) | |
| download | protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.gz protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.tar.bz2 protobuf-6bbe197e9c1b6fc38cbdc45e3bf83fa7ced792a3.zip | |
Down-integrate from google3.
Diffstat (limited to 'src/google/protobuf/arenastring_unittest.cc')
| -rw-r--r-- | src/google/protobuf/arenastring_unittest.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/google/protobuf/arenastring_unittest.cc b/src/google/protobuf/arenastring_unittest.cc index adc44fe2..c5f89a70 100644 --- a/src/google/protobuf/arenastring_unittest.cc +++ b/src/google/protobuf/arenastring_unittest.cc @@ -45,11 +45,12 @@ #include <google/protobuf/io/zero_copy_stream_impl.h> -namespace google { -using google::protobuf::internal::ArenaStringPtr; +namespace google { namespace protobuf { +using internal::ArenaStringPtr; + static string WrapString(const char* value) { return value; @@ -81,7 +82,7 @@ TEST(ArenaStringPtrTest, ArenaStringPtrOnHeap) { } TEST(ArenaStringPtrTest, ArenaStringPtrOnArena) { - google::protobuf::Arena arena; + Arena arena; ArenaStringPtr field; ::std::string default_value = "default"; field.UnsafeSetDefault(&default_value); @@ -107,7 +108,7 @@ TEST(ArenaStringPtrTest, ArenaStringPtrOnArena) { } TEST(ArenaStringPtrTest, ArenaStringPtrOnArenaNoSSO) { - google::protobuf::Arena arena; + Arena arena; ArenaStringPtr field; ::std::string default_value = "default"; field.UnsafeSetDefault(&default_value); |