diff options
| author |  Andrew Paprocki <andrew@ishiboo.com> | 2014-10-31 16:44:04 -0400 |
|---|---|---|
| committer | Andrew Paprocki <andrew@ishiboo.com> | 2014-11-11 15:36:23 -0500 |
| commit | af88ccb5fc6fcb1a4d6654cc3085cf269b646a96 (patch) | |
| tree | dc9cb070c2e9e8849210a94ab7339c17dfef0df7 /src/google/protobuf/stubs/type_traits_unittest.cc | |
| parent | 1ddf6937ee77f52b421894a7872f5c815a4c5c13 (diff) | |
Modify tests to compile on AIX with xlC compiler.
- `int64` typedef collision with `sys/inttypes.h`
- `xlC` complains about `int` and pointer comparisons without casts
Diffstat (limited to 'src/google/protobuf/stubs/type_traits_unittest.cc')
| -rw-r--r-- | src/google/protobuf/stubs/type_traits_unittest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/google/protobuf/stubs/type_traits_unittest.cc b/src/google/protobuf/stubs/type_traits_unittest.cc index 7a8cbfb8..b42b9e83 100644 --- a/src/google/protobuf/stubs/type_traits_unittest.cc +++ b/src/google/protobuf/stubs/type_traits_unittest.cc @@ -41,7 +41,10 @@ #include <gtest/gtest.h> typedef int int32; +// IBM AIX typedefs `int64` in `sys/inttypes.h`, included transitively above. +#ifndef _AIX typedef long int64; +#endif using std::string; using std::vector; |