diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 09:03:13 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2016-05-03 09:03:13 +0200 |
| commit | ff20dd34f91fecfc351804605b822999cde0e593 (patch) | |
| tree | 9abce46a1d5403ad64bf350f6d2b5509a91e7eb6 /cpp/include | |
| parent | Fix to no longer recursively try endpoints on connection establishment (diff) | |
| download | ice-ff20dd34f91fecfc351804605b822999cde0e593.tar.bz2 ice-ff20dd34f91fecfc351804605b822999cde0e593.tar.xz ice-ff20dd34f91fecfc351804605b822999cde0e593.zip | |
AIX port
Diffstat (limited to 'cpp/include')
| -rw-r--r-- | cpp/include/Ice/SlicedData.h | 6 | ||||
| -rw-r--r-- | cpp/include/IceUtil/Config.h | 11 |
2 files changed, 17 insertions, 0 deletions
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h index 5168890c567..919dc54c187 100644 --- a/cpp/include/Ice/SlicedData.h +++ b/cpp/include/Ice/SlicedData.h @@ -69,7 +69,13 @@ public: // // Unknown sliced object holds instance of unknown type. // + +#ifdef __IBMCPP__ +// xlC does not handle properly the public/private multiple inheritance from Object +class ICE_API UnknownSlicedObject : public IceInternal::GCObject +#else class ICE_API UnknownSlicedObject : virtual public Object, private IceInternal::GCObject +#endif { public: diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h index c70f6350a77..0f8d19b8a26 100644 --- a/cpp/include/IceUtil/Config.h +++ b/cpp/include/IceUtil/Config.h @@ -175,6 +175,17 @@ # include <TargetConditionals.h> #endif +#if defined(_AIX) && defined(_LARGE_FILES) + // defines macros such as open that we want to use consistently everywhere +# include <fcntl.h> +#endif + +#ifdef __IBMCPP__ +// TODO: better fix for this warning +# pragma report(disable, "1540-0198") // private inheritance without private keyword +#endif + + #if !defined(ICE_BUILDING_ICE_UTIL) && defined(ICE_UTIL_API_EXPORTS) # define ICE_BUILDING_ICE_UTIL #endif |