Commit af88ccb5 authored by Andrew Paprocki's avatar Andrew Paprocki

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
parent 1ddf6937
...@@ -1307,11 +1307,11 @@ class RepeatedPtrIterator ...@@ -1307,11 +1307,11 @@ class RepeatedPtrIterator
it_ += d; it_ += d;
return *this; return *this;
} }
friend iterator operator+(iterator it, difference_type d) { friend iterator operator+(iterator it, const difference_type d) {
it += d; it += d;
return it; return it;
} }
friend iterator operator+(difference_type d, iterator it) { friend iterator operator+(const difference_type d, iterator it) {
it += d; it += d;
return it; return it;
} }
......
...@@ -41,7 +41,10 @@ ...@@ -41,7 +41,10 @@
#include <gtest/gtest.h> #include <gtest/gtest.h>
typedef int int32; typedef int int32;
// IBM AIX typedefs `int64` in `sys/inttypes.h`, included transitively above.
#ifndef _AIX
typedef long int64; typedef long int64;
#endif
using std::string; using std::string;
using std::vector; using std::vector;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment