diff options
| author | Jose <jose@zeroc.com> | 2015-07-22 20:43:10 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2015-07-22 20:43:10 +0200 |
| commit | 384703182ca649685759760a8a458bd898c64032 (patch) | |
| tree | 05b40fd867c025b0e9d5490c460c063aa711eea5 /cpp/src/Ice/Initialize.cpp | |
| parent | adding Slice comment for IceLocatorDiscovery (diff) | |
| parent | Add VC140 to CPP_COMPILER supported values (diff) | |
| download | ice-384703182ca649685759760a8a458bd898c64032.tar.bz2 ice-384703182ca649685759760a8a458bd898c64032.tar.xz ice-384703182ca649685759760a8a458bd898c64032.zip | |
Merge 'origin/3.6'
Diffstat (limited to 'cpp/src/Ice/Initialize.cpp')
| -rw-r--r-- | cpp/src/Ice/Initialize.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp index 0e286f99c0c..655a37920de 100644 --- a/cpp/src/Ice/Initialize.cpp +++ b/cpp/src/Ice/Initialize.cpp @@ -7,7 +7,6 @@ // // ********************************************************************** -#include <IceUtil/DisableWarnings.h> #include <IceUtil/ArgVector.h> #include <Ice/CommunicatorI.h> #include <Ice/PropertiesI.h> |