diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-08-09 17:05:42 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-08-09 17:05:42 -0400 |
| commit | a9e44ca45db29a778490b52f4e6b7717e1ca93de (patch) | |
| tree | 293fb8f892f096c49fc8f151be0af34181ed7c26 /cpp/src | |
| parent | Fixed file permission (diff) | |
| download | ice-a9e44ca45db29a778490b52f4e6b7717e1ca93de.tar.bz2 ice-a9e44ca45db29a778490b52f4e6b7717e1ca93de.tar.xz ice-a9e44ca45db29a778490b52f4e6b7717e1ca93de.zip | |
Cleaned up warning-disabling on Windows
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/DefaultsAndOverrides.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/LocatorInfo.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/Network.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/OutgoingAsync.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/InternalRegistryI.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/IceGrid/ServerCache.cpp | 1 | ||||
| -rwxr-xr-x | cpp/src/IceGrid/ServerI.cpp | 1 | ||||
| -rw-r--r-- | cpp/src/iceserviceinstall/ServiceInstaller.cpp | 3 | ||||
| -rwxr-xr-x | cpp/src/slice2confluence/Gen.cpp | 4 | ||||
| -rwxr-xr-x | cpp/src/slice2html/Gen.cpp | 4 |
10 files changed, 8 insertions, 10 deletions
diff --git a/cpp/src/Ice/DefaultsAndOverrides.cpp b/cpp/src/Ice/DefaultsAndOverrides.cpp index 43e654463f8..7914e17a5a1 100644 --- a/cpp/src/Ice/DefaultsAndOverrides.cpp +++ b/cpp/src/Ice/DefaultsAndOverrides.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <Ice/DefaultsAndOverrides.h> #include <Ice/Properties.h> #include <Ice/Network.h> diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp index 9d5442d6409..15c78d1fcd7 100644 --- a/cpp/src/Ice/LocatorInfo.cpp +++ b/cpp/src/Ice/LocatorInfo.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <Ice/LocatorInfo.h> #include <Ice/Locator.h> #include <Ice/LocalException.h> diff --git a/cpp/src/Ice/Network.cpp b/cpp/src/Ice/Network.cpp index 1258fa186a9..3a2f6d402e3 100644 --- a/cpp/src/Ice/Network.cpp +++ b/cpp/src/Ice/Network.cpp @@ -17,6 +17,7 @@ # include <netinet/in.h> #endif +#include <IceUtil/DisableWarnings.h> #include <Ice/Network.h> #include <IceUtil/StringUtil.h> #include <IceUtil/Unicode.h> diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp index 007d1c275a2..a5bfa8c4af8 100644 --- a/cpp/src/Ice/OutgoingAsync.cpp +++ b/cpp/src/Ice/OutgoingAsync.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <Ice/OutgoingAsync.h> #include <Ice/Object.h> #include <Ice/ConnectionI.h> diff --git a/cpp/src/IceGrid/InternalRegistryI.cpp b/cpp/src/IceGrid/InternalRegistryI.cpp index 02134635c90..8d5f7b081ed 100644 --- a/cpp/src/IceGrid/InternalRegistryI.cpp +++ b/cpp/src/IceGrid/InternalRegistryI.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <Ice/Ice.h> #include <IceGrid/RegistryI.h> diff --git a/cpp/src/IceGrid/ServerCache.cpp b/cpp/src/IceGrid/ServerCache.cpp index df7bcd37325..d9be593a4af 100644 --- a/cpp/src/IceGrid/ServerCache.cpp +++ b/cpp/src/IceGrid/ServerCache.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <Ice/LoggerUtil.h> #include <Ice/Communicator.h> #include <Ice/LocalException.h> diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp index ea53de6b671..1eb80d965f3 100755 --- a/cpp/src/IceGrid/ServerI.cpp +++ b/cpp/src/IceGrid/ServerI.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceUtil/DisableWarnings.h> #include <IceUtil/FileUtil.h> #include <Ice/Ice.h> #include <Ice/Instance.h> diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.cpp b/cpp/src/iceserviceinstall/ServiceInstaller.cpp index dd046a0755a..0eb36071ddb 100644 --- a/cpp/src/iceserviceinstall/ServiceInstaller.cpp +++ b/cpp/src/iceserviceinstall/ServiceInstaller.cpp @@ -7,8 +7,7 @@ // // ********************************************************************** -#define _CRT_SECURE_NO_DEPRECATE 1 // C4996 '<C function>' was declared deprecated - +#include <IceUtil/DisableWarnings.h> #include <ServiceInstaller.h> #include <IceUtil/StringUtil.h> #include <IceUtil/FileUtil.h> diff --git a/cpp/src/slice2confluence/Gen.cpp b/cpp/src/slice2confluence/Gen.cpp index 80459a650df..42425db59cd 100755 --- a/cpp/src/slice2confluence/Gen.cpp +++ b/cpp/src/slice2confluence/Gen.cpp @@ -7,10 +7,6 @@ // // ********************************************************************** -#if defined(_MSC_VER) -# define _CRT_SECURE_NO_DEPRECATE 1 // C4996 '<C function>' was declared deprecated -#endif - #include <IceUtil/DisableWarnings.h> #include <IceUtil/Functional.h> #include <IceUtil/StringUtil.h> diff --git a/cpp/src/slice2html/Gen.cpp b/cpp/src/slice2html/Gen.cpp index 6472f661e45..08eed8b4cf6 100755 --- a/cpp/src/slice2html/Gen.cpp +++ b/cpp/src/slice2html/Gen.cpp @@ -7,10 +7,6 @@ // // ********************************************************************** -#if defined(_MSC_VER) -# define _CRT_SECURE_NO_DEPRECATE 1 // C4996 '<C function>' was declared deprecated -#endif - #include <IceUtil/DisableWarnings.h> #include <IceUtil/Functional.h> #include <IceUtil/StringUtil.h> |