aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/arenastring_unittest.cc
diff options
context:
space:
mode:
Diffstat (limited to 'src/google/protobuf/arenastring_unittest.cc')
-rw-r--r--src/google/protobuf/arenastring_unittest.cc9
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);