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 | |
parent | 1ddf6937ee77f52b421894a7872f5c815a4c5c13 (diff) | |
download | protobuf-af88ccb5fc6fcb1a4d6654cc3085cf269b646a96.tar.gz protobuf-af88ccb5fc6fcb1a4d6654cc3085cf269b646a96.tar.bz2 protobuf-af88ccb5fc6fcb1a4d6654cc3085cf269b646a96.zip |
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')
-rw-r--r-- | src/google/protobuf/repeated_field.h | 4 | ||||
-rw-r--r-- | src/google/protobuf/stubs/type_traits_unittest.cc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/google/protobuf/repeated_field.h b/src/google/protobuf/repeated_field.h index 50051831..df0625c9 100644 --- a/src/google/protobuf/repeated_field.h +++ b/src/google/protobuf/repeated_field.h @@ -1307,11 +1307,11 @@ class RepeatedPtrIterator it_ += d; return *this; } - friend iterator operator+(iterator it, difference_type d) { + friend iterator operator+(iterator it, const difference_type d) { it += d; return it; } - friend iterator operator+(difference_type d, iterator it) { + friend iterator operator+(const difference_type d, iterator it) { it += d; return it; } 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; |