diff options
Diffstat (limited to 'src/google/protobuf/io/coded_stream_unittest.cc')
| -rw-r--r-- | src/google/protobuf/io/coded_stream_unittest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/google/protobuf/io/coded_stream_unittest.cc b/src/google/protobuf/io/coded_stream_unittest.cc index 1c8d3272..52cc7c33 100644 --- a/src/google/protobuf/io/coded_stream_unittest.cc +++ b/src/google/protobuf/io/coded_stream_unittest.cc @@ -44,18 +44,20 @@ #include <google/protobuf/stubs/common.h> #include <google/protobuf/stubs/logging.h> #include <google/protobuf/stubs/logging.h> +#include <google/protobuf/io/zero_copy_stream_impl.h> #include <google/protobuf/testing/googletest.h> #include <gtest/gtest.h> -#include <google/protobuf/io/zero_copy_stream_impl.h> +#include <google/protobuf/stubs/casts.h> +#include <google/protobuf/port_def.inc> // This declares an unsigned long long integer literal in a portable way. // (The original macro is way too big and ruins my formatting.) #undef ULL -#define ULL(x) GOOGLE_ULONGLONG(x) +#define ULL(x) PROTOBUF_ULONGLONG(x) -namespace google { +namespace google { namespace protobuf { namespace io { namespace { |