diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-02 17:49:55 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-02 17:49:55 -0400 |
| commit | c62875aaf28d64497a4effa78ce0e5b05fc9ed29 (patch) | |
| tree | 9d08d049fbde0b5d25d8e679a9dd205ca11062ca /cpp/include/Ice/StreamHelpers.h | |
| parent | Move generateUUID to Ice (diff) | |
| download | ice-c62875aaf28d64497a4effa78ce0e5b05fc9ed29.tar.bz2 ice-c62875aaf28d64497a4effa78ce0e5b05fc9ed29.tar.xz ice-c62875aaf28d64497a4effa78ce0e5b05fc9ed29.zip | |
Update DispatchInterceptorAsyncCallback + small cleanups
Diffstat (limited to 'cpp/include/Ice/StreamHelpers.h')
| -rw-r--r-- | cpp/include/Ice/StreamHelpers.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h index a7773a27090..4ba92953d84 100644 --- a/cpp/include/Ice/StreamHelpers.h +++ b/cpp/include/Ice/StreamHelpers.h @@ -10,11 +10,13 @@ #ifndef ICE_STREAM_HELPERS_H #define ICE_STREAM_HELPERS_H -#include <IceUtil/ScopedArray.h> -#include <IceUtil/Iterator.h> - #include <Ice/ObjectF.h> +#ifndef ICE_CPP11_MAPPING +# include <IceUtil/ScopedArray.h> +# include <IceUtil/Iterator.h> +#endif + namespace Ice { |