From b7fd9dbe7ab341c95254ddba98b93c8265ac985a Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Wed, 16 Dec 2015 13:35:46 +0100
Subject: IceGridLib build fixes

---
 cpp/src/IceGrid/AdapterCache.h            | 2 +-
 cpp/src/IceGrid/Client.cpp                | 1 -
 cpp/src/IceGrid/LocatorI.h                | 2 +-
 cpp/src/IceGrid/NodeSessionManager.cpp    | 1 -
 cpp/src/IceGrid/NodeSessionManager.h      | 2 +-
 cpp/src/IceGrid/Parser.h                  | 2 +-
 cpp/src/IceGrid/RegistryI.h               | 2 --
 cpp/src/IceGrid/ServerCache.h             | 2 +-
 cpp/src/IceGrid/SessionManager.h          | 2 +-
 cpp/src/IceGrid/Topics.h                  | 2 +-
 cpp/src/IceGrid/WellKnownObjectsManager.h | 2 +-
 11 files changed, 8 insertions(+), 12 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/IceGrid/AdapterCache.h b/cpp/src/IceGrid/AdapterCache.h
index 67903849569..b97ab88df15 100644
--- a/cpp/src/IceGrid/AdapterCache.h
+++ b/cpp/src/IceGrid/AdapterCache.h
@@ -13,7 +13,7 @@
 #include <IceUtil/Mutex.h>
 #include <IceUtil/Shared.h>
 #include <IceGrid/Cache.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <IceGrid/Internal.h>
 
 #include <set>
diff --git a/cpp/src/IceGrid/Client.cpp b/cpp/src/IceGrid/Client.cpp
index 95a6c7ef745..4a23b698bff 100644
--- a/cpp/src/IceGrid/Client.cpp
+++ b/cpp/src/IceGrid/Client.cpp
@@ -20,7 +20,6 @@
 #include <IceGrid/Parser.h>
 #include <IceGrid/FileParserI.h>
 #include <IceGrid/Registry.h>
-#include <IceGrid/Locator.h>
 #include <IceGrid/IceLocatorDiscovery.h>
 #include <Glacier2/Router.h>
 #include <fstream>
diff --git a/cpp/src/IceGrid/LocatorI.h b/cpp/src/IceGrid/LocatorI.h
index 9c12ee14da8..2d420f41aab 100644
--- a/cpp/src/IceGrid/LocatorI.h
+++ b/cpp/src/IceGrid/LocatorI.h
@@ -11,7 +11,7 @@
 #define ICE_GRID_LOCATOR_I_H
 
 #include <IceGrid/Internal.h>
-#include <IceGrid/Locator.h>
+#include <IceGrid/Registry.h>
 
 #include <set>
 
diff --git a/cpp/src/IceGrid/NodeSessionManager.cpp b/cpp/src/IceGrid/NodeSessionManager.cpp
index 488e0c6fdfe..861d52d24fc 100644
--- a/cpp/src/IceGrid/NodeSessionManager.cpp
+++ b/cpp/src/IceGrid/NodeSessionManager.cpp
@@ -11,7 +11,6 @@
 #include <IceGrid/NodeSessionManager.h>
 #include <IceGrid/TraceLevels.h>
 #include <IceGrid/NodeI.h>
-#include <IceGrid/Query.h>
 
 using namespace std;
 using namespace IceGrid;
diff --git a/cpp/src/IceGrid/NodeSessionManager.h b/cpp/src/IceGrid/NodeSessionManager.h
index 8f5c2e88051..1198150e709 100644
--- a/cpp/src/IceGrid/NodeSessionManager.h
+++ b/cpp/src/IceGrid/NodeSessionManager.h
@@ -15,7 +15,7 @@
 #include <IceUtil/Monitor.h>
 
 #include <IceGrid/SessionManager.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <IceGrid/Internal.h>
 #include <set>
 
diff --git a/cpp/src/IceGrid/Parser.h b/cpp/src/IceGrid/Parser.h
index 388112426e6..703949313ba 100644
--- a/cpp/src/IceGrid/Parser.h
+++ b/cpp/src/IceGrid/Parser.h
@@ -12,7 +12,7 @@
 
 #include <IceUtil/Handle.h>
 #include <IceGrid/Admin.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <list>
 #include <stdio.h>
 
diff --git a/cpp/src/IceGrid/RegistryI.h b/cpp/src/IceGrid/RegistryI.h
index 66ff4852ab0..9f6178fcb3d 100644
--- a/cpp/src/IceGrid/RegistryI.h
+++ b/cpp/src/IceGrid/RegistryI.h
@@ -12,8 +12,6 @@
 
 #include <IceUtil/Timer.h>
 #include <IceGrid/Registry.h>
-#include <IceGrid/Query.h>
-#include <IceGrid/Locator.h>
 #include <IceGrid/Internal.h>
 #include <IceGrid/PlatformInfo.h>
 #include <IceGrid/ReplicaSessionManager.h>
diff --git a/cpp/src/IceGrid/ServerCache.h b/cpp/src/IceGrid/ServerCache.h
index f6b32e5c5de..7e5b8d6f27f 100644
--- a/cpp/src/IceGrid/ServerCache.h
+++ b/cpp/src/IceGrid/ServerCache.h
@@ -14,7 +14,7 @@
 #include <IceUtil/Shared.h>
 #include <IceGrid/Descriptor.h>
 #include <IceGrid/Internal.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <IceGrid/Allocatable.h>
 #include <IceGrid/Cache.h>
 
diff --git a/cpp/src/IceGrid/SessionManager.h b/cpp/src/IceGrid/SessionManager.h
index 2b9638937f6..77c225cbf09 100644
--- a/cpp/src/IceGrid/SessionManager.h
+++ b/cpp/src/IceGrid/SessionManager.h
@@ -18,7 +18,7 @@
 #include <Ice/Logger.h>
 #include <Ice/LoggerUtil.h>
 
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <IceGrid/Internal.h>
 
 namespace IceGrid
diff --git a/cpp/src/IceGrid/Topics.h b/cpp/src/IceGrid/Topics.h
index e9f7e2775e0..30c6e2652c0 100644
--- a/cpp/src/IceGrid/Topics.h
+++ b/cpp/src/IceGrid/Topics.h
@@ -13,7 +13,7 @@
 #include <IceUtil/Mutex.h>
 #include <IceStorm/IceStorm.h>
 #include <IceGrid/Internal.h>
-#include <IceGrid/Observer.h>
+#include <IceGrid/Registry.h>
 #include <set>
 
 namespace IceGrid
diff --git a/cpp/src/IceGrid/WellKnownObjectsManager.h b/cpp/src/IceGrid/WellKnownObjectsManager.h
index 723b1ff8ae3..e50f61b9c96 100644
--- a/cpp/src/IceGrid/WellKnownObjectsManager.h
+++ b/cpp/src/IceGrid/WellKnownObjectsManager.h
@@ -11,7 +11,7 @@
 #define ICE_GRID_WELL_KNOWN_OBJECTS_MANAGER_H
 
 #include <IceGrid/Internal.h>
-#include <IceGrid/Locator.h>
+#include <IceGrid/Registry.h>
 
 namespace IceGrid
 {
-- 
cgit v1.2.3