diff options
Diffstat (limited to 'cppe')
| -rw-r--r-- | cppe/include/IceE/DisableWarnings.h | 28 | ||||
| -rw-r--r-- | cppe/src/IceE/BasicStream.cpp | 1 | ||||
| -rwxr-xr-x | cppe/src/IceE/Connection.cpp | 1 | ||||
| -rw-r--r-- | cppe/src/IceE/Instance.cpp | 1 | ||||
| -rw-r--r-- | cppe/src/IceE/Properties.cpp | 1 | ||||
| -rwxr-xr-x | cppe/src/IceE/SafeStdio.cpp | 1 | ||||
| -rw-r--r-- | cppe/src/IceE/Time.cpp | 1 | ||||
| -rwxr-xr-x | cppe/test/Common/TestCommon.cpp | 1 | ||||
| -rw-r--r-- | cppe/test/IceE/thread/CreateTest.cpp | 1 |
9 files changed, 36 insertions, 0 deletions
diff --git a/cppe/include/IceE/DisableWarnings.h b/cppe/include/IceE/DisableWarnings.h new file mode 100644 index 00000000000..956bc212695 --- /dev/null +++ b/cppe/include/IceE/DisableWarnings.h @@ -0,0 +1,28 @@ +// ********************************************************************** +// +// Copyright (c) 2003-2006 ZeroC, Inc. All rights reserved. +// +// This copy of Ice-E is licensed to you under the terms described in the +// ICEE_LICENSE file included in this distribution. +// +// ********************************************************************** + +#ifndef ICEE_DISABLEWARNINGS_H +#define ICEE_DISABLEWARNINGS_H + +// +// This header file disables various annoying compiler warnings that +// we don't want. +// +// IMPORTANT: Do *not* include this header file in another public header file! +// Doing this may potentially disable the warnings in the source +// code of our customers, which would be bad. Only include this +// header file in Ice *source* files! +// + +#if defined(_MSC_VER) && _MSC_VER >= 1400 +# define _CRT_SECURE_NO_DEPRECATE 1 // C4996 '<C function>' was declared deprecated/ +# pragma warning( 4 : 4996 ) // C4996 'std::<function>' was declared deprecated +#endif + +#endif diff --git a/cppe/src/IceE/BasicStream.cpp b/cppe/src/IceE/BasicStream.cpp index 229136f8b72..bd7dd86c998 100644 --- a/cppe/src/IceE/BasicStream.cpp +++ b/cppe/src/IceE/BasicStream.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceE/DisableWarnings.h> #include <IceE/BasicStream.h> #include <IceE/Instance.h> #include <IceE/ProxyFactory.h> diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp index 3bc849851d0..ef392c29c7a 100755 --- a/cppe/src/IceE/Connection.cpp +++ b/cppe/src/IceE/Connection.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceE/DisableWarnings.h> #include <IceE/Connection.h> #include <IceE/Instance.h> #include <IceE/LoggerUtil.h> diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp index c30b41df662..25148880639 100644 --- a/cppe/src/IceE/Instance.cpp +++ b/cppe/src/IceE/Instance.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceE/DisableWarnings.h> #include <IceE/Instance.h> #include <IceE/TraceLevels.h> #include <IceE/DefaultsAndOverrides.h> diff --git a/cppe/src/IceE/Properties.cpp b/cppe/src/IceE/Properties.cpp index dd355d3b3a2..24866009130 100644 --- a/cppe/src/IceE/Properties.cpp +++ b/cppe/src/IceE/Properties.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceE/DisableWarnings.h> #include <IceE/Properties.h> #include <IceE/StringUtil.h> #include <IceE/Initialize.h> diff --git a/cppe/src/IceE/SafeStdio.cpp b/cppe/src/IceE/SafeStdio.cpp index 374852d47a4..bb46f99ae53 100755 --- a/cppe/src/IceE/SafeStdio.cpp +++ b/cppe/src/IceE/SafeStdio.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceE/DisableWarnings.h> #include <IceE/SafeStdio.h> #include <stdarg.h> #include <stdio.h> diff --git a/cppe/src/IceE/Time.cpp b/cppe/src/IceE/Time.cpp index a42ac3fa963..eec75dc93e3 100644 --- a/cppe/src/IceE/Time.cpp +++ b/cppe/src/IceE/Time.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceE/DisableWarnings.h> #include <IceE/Time.h> #ifndef _WIN32_WCE diff --git a/cppe/test/Common/TestCommon.cpp b/cppe/test/Common/TestCommon.cpp index 24ca71a5d5e..3d8f03a0dfb 100755 --- a/cppe/test/Common/TestCommon.cpp +++ b/cppe/test/Common/TestCommon.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceE/DisableWarnings.h> #include <TestCommon.h> #include <TestApplication.h> diff --git a/cppe/test/IceE/thread/CreateTest.cpp b/cppe/test/IceE/thread/CreateTest.cpp index 4e973a9d68d..d12dc62cb30 100644 --- a/cppe/test/IceE/thread/CreateTest.cpp +++ b/cppe/test/IceE/thread/CreateTest.cpp @@ -7,6 +7,7 @@ // // ********************************************************************** +#include <IceE/DisableWarnings.h> #include <IceE/IceE.h> #include <stdio.h> |