diff options
| author | Bernard Normier <bernard@zeroc.com> | 2016-08-02 20:05:35 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2016-08-02 20:05:35 -0400 |
| commit | 0e6b39b7f6d6cf46061342a963ba2536497c9a4f (patch) | |
| tree | 12b6104fd5f0987037567245f205b9375a13005e | |
| parent | Moved StopWatch.h to IceUtil public include (diff) | |
| download | ice-0e6b39b7f6d6cf46061342a963ba2536497c9a4f.tar.bz2 ice-0e6b39b7f6d6cf46061342a963ba2536497c9a4f.tar.xz ice-0e6b39b7f6d6cf46061342a963ba2536497c9a4f.zip | |
Replaced IceUtil/Config.h by Ice/Config.h
| -rw-r--r-- | cpp/include/Glacier2/Glacier2.h | 2 | ||||
| -rw-r--r-- | cpp/include/Ice/Dispatcher.h | 2 | ||||
| -rw-r--r-- | cpp/include/Ice/Service.h | 1 | ||||
| -rw-r--r-- | cpp/include/Ice/ValueF.h | 2 | ||||
| -rw-r--r-- | cpp/include/Ice/VirtualShared.h | 2 | ||||
| -rw-r--r-- | cpp/include/IceSSL/IceSSL.h | 2 | ||||
| -rw-r--r-- | cpp/include/IceStorm/Config.h | 2 |
7 files changed, 6 insertions, 7 deletions
diff --git a/cpp/include/Glacier2/Glacier2.h b/cpp/include/Glacier2/Glacier2.h index a8e9a4b0027..c5acf6bd16e 100644 --- a/cpp/include/Glacier2/Glacier2.h +++ b/cpp/include/Glacier2/Glacier2.h @@ -11,7 +11,7 @@ #define GLACIER2_H #include <IceUtil/PushDisableWarnings.h> -#include <IceUtil/Config.h> +#include <Ice/Config.h> #include <Glacier2/Router.h> #include <Glacier2/Session.h> #include <Glacier2/PermissionsVerifier.h> diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h index cb9a25c124e..8b293160ef0 100644 --- a/cpp/include/Ice/Dispatcher.h +++ b/cpp/include/Ice/Dispatcher.h @@ -16,7 +16,7 @@ // with the C++11 mapping // -#include <IceUtil/Config.h> +#include <Ice/Config.h> #include <IceUtil/Shared.h> #include <IceUtil/Handle.h> #include <Ice/ConnectionF.h> diff --git a/cpp/include/Ice/Service.h b/cpp/include/Ice/Service.h index e36b308c3ff..f5e9b4b2604 100644 --- a/cpp/include/Ice/Service.h +++ b/cpp/include/Ice/Service.h @@ -10,7 +10,6 @@ #ifndef ICE_SERVICE_H #define ICE_SERVICE_H -#include <IceUtil/Config.h> #include <Ice/Ice.h> #ifdef _WIN32 diff --git a/cpp/include/Ice/ValueF.h b/cpp/include/Ice/ValueF.h index f64789ef3ca..8c7b309ff09 100644 --- a/cpp/include/Ice/ValueF.h +++ b/cpp/include/Ice/ValueF.h @@ -11,7 +11,7 @@ #define ICE_VALUE_F_H #ifdef ICE_CPP11_MAPPING -#include <IceUtil/Config.h> +#include <Ice/Config.h> namespace Ice { diff --git a/cpp/include/Ice/VirtualShared.h b/cpp/include/Ice/VirtualShared.h index 582ada67e65..72aff3df7f7 100644 --- a/cpp/include/Ice/VirtualShared.h +++ b/cpp/include/Ice/VirtualShared.h @@ -10,7 +10,7 @@ #ifndef ICE_VIRTUAL_SHARED_H #define ICE_VIRTUAL_SHARED_H -#include <IceUtil/Config.h> +#include <Ice/Config.h> namespace Ice { diff --git a/cpp/include/IceSSL/IceSSL.h b/cpp/include/IceSSL/IceSSL.h index a4e8719b6dc..8bc0c8dee33 100644 --- a/cpp/include/IceSSL/IceSSL.h +++ b/cpp/include/IceSSL/IceSSL.h @@ -11,7 +11,7 @@ #define ICE_SSL_ICE_SSL_H #include <IceUtil/PushDisableWarnings.h> -#include <IceUtil/Config.h> +#include <Ice/Config.h> #if !defined(ICE_OS_WINRT) # include <IceSSL/Plugin.h> #endif diff --git a/cpp/include/IceStorm/Config.h b/cpp/include/IceStorm/Config.h index 28957e5fc42..1b664edcf66 100644 --- a/cpp/include/IceStorm/Config.h +++ b/cpp/include/IceStorm/Config.h @@ -10,7 +10,7 @@ #ifndef ICE_STORM_CONFIG_H #define ICE_STORM_CONFIG_H -#include <IceUtil/Config.h> +#include <Ice/Config.h> // // Automatically link with IceStorm[D|++11|++11D].lib |