diff options
| author | Bernard Normier <bernard@zeroc.com> | 2014-10-31 15:03:01 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2014-10-31 15:03:01 -0400 |
| commit | 1307d3d1626ca3410cb980c1cd4bdad0f0673aac (patch) | |
| tree | dddc4eff26a445eafa5916b6a567f06d1c5a2b0c /cpp/src/slice2freeze/Main.cpp | |
| parent | Fix demo builds caused by ICE-5813 (diff) | |
| download | ice-1307d3d1626ca3410cb980c1cd4bdad0f0673aac.tar.bz2 ice-1307d3d1626ca3410cb980c1cd4bdad0f0673aac.tar.xz ice-1307d3d1626ca3410cb980c1cd4bdad0f0673aac.zip | |
New IceUtil headers to push and pop pragma disable warning with MSVC and GCC
Diffstat (limited to 'cpp/src/slice2freeze/Main.cpp')
| -rw-r--r-- | cpp/src/slice2freeze/Main.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cpp/src/slice2freeze/Main.cpp b/cpp/src/slice2freeze/Main.cpp index 23d2c19fddb..ada958b3c23 100644 --- a/cpp/src/slice2freeze/Main.cpp +++ b/cpp/src/slice2freeze/Main.cpp @@ -1367,6 +1367,8 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co H << "\n#define __" << s << "__"; H << '\n'; + H << "\n#include <IceUtil/PushDisableWarnings.h>"; + if(dicts.size() > 0) { H << "\n#include <Freeze/Map.h>"; @@ -1382,8 +1384,11 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co H << "\n#include <" << changeInclude(*p, includePaths) << "." + headerExtension + ">"; } + + CPP << "\n#include <IceUtil/PushDisableWarnings.h>"; CPP << "\n#include <Ice/BasicStream.h>"; CPP << "\n#include <IceUtil/StringUtil.h>"; + CPP << "\n#include <IceUtil/PopDisableWarnings.h>"; CPP << "\n#include <"; if(include.size()) { @@ -1410,7 +1415,8 @@ gen(const string& name, const UnitPtr& u, const vector<string>& includePaths, co writeIndex(name, u, *q, H, CPP, dllExport); } - H << "\n\n#endif\n"; + H << "\n\n#include <IceUtil/PopDisableWarnings.h>"; + H << "\n#endif\n"; CPP << '\n'; H.close(); |