From d29abfae967e39035ae7f3939f02ab9f50103aeb Mon Sep 17 00:00:00 2001
From: Jose <jose@zeroc.com>
Date: Wed, 16 Dec 2015 12:37:46 +0100
Subject: Avoid forward declarations with IceGridLib

---
 cpp/src/IceGrid/Internal.ice | 2 --
 cpp/src/IceGrid/QueryI.h     | 2 +-
 cpp/src/IceGridLib/Makefile  | 3 ---
 cpp/src/IceStorm/Service.cpp | 3 +--
 cpp/src/Makefile             | 5 ++++-
 cpp/src/Makefile.mak         | 5 ++++-
 6 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'cpp/src')

diff --git a/cpp/src/IceGrid/Internal.ice b/cpp/src/IceGrid/Internal.ice
index 3d7392efab9..424482156ed 100644
--- a/cpp/src/IceGrid/Internal.ice
+++ b/cpp/src/IceGrid/Internal.ice
@@ -14,12 +14,10 @@
 #include <Ice/Identity.ice>
 #include <Ice/BuiltinSequences.ice>
 #include <Ice/ProcessF.ice>
-#include <Ice/Locator.ice>
 #include <Ice/Properties.ice>
 
 #include <Glacier2/Session.ice>
 #include <IceGrid/Admin.ice>
-#include <IceGrid/Observer.ice>
 #include <IceGrid/Registry.ice>
 
 module IceGrid
diff --git a/cpp/src/IceGrid/QueryI.h b/cpp/src/IceGrid/QueryI.h
index 482322f08a0..c969ecdf64d 100644
--- a/cpp/src/IceGrid/QueryI.h
+++ b/cpp/src/IceGrid/QueryI.h
@@ -10,7 +10,7 @@
 #ifndef ICE_GRID_QUERY_I_H
 #define ICE_GRID_QUERY_I_H
 
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 #include <Ice/CommunicatorF.h>
 
 namespace IceGrid
diff --git a/cpp/src/IceGridLib/Makefile b/cpp/src/IceGridLib/Makefile
index 05410c99580..e41af83e175 100644
--- a/cpp/src/IceGridLib/Makefile
+++ b/cpp/src/IceGridLib/Makefile
@@ -20,10 +20,7 @@ SLICE_OBJS	= Admin.o \
 		  Descriptor.o \
 		  Exception.o \
 		  FileParser.o \
-		  Locator.o \
-		  Observer.o \
 		  PluginFacade.o \
-		  Query.o \
 		  Registry.o \
 		  Session.o \
 		  UserAccountMapper.o
diff --git a/cpp/src/IceStorm/Service.cpp b/cpp/src/IceStorm/Service.cpp
index 572c236694d..fe69458e883 100644
--- a/cpp/src/IceStorm/Service.cpp
+++ b/cpp/src/IceStorm/Service.cpp
@@ -26,8 +26,7 @@
 #include <IceStorm/NodeI.h>
 #include <IceStorm/TransientTopicI.h>
 
-#include <IceGrid/Locator.h>
-#include <IceGrid/Query.h>
+#include <IceGrid/Registry.h>
 
 using namespace std;
 using namespace Ice;
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index 12c87196c3f..4c9ac214b89 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -17,7 +17,10 @@ ifeq ($(CPP11_MAPPING),yes)
 		  slice2cpp \
 		  Ice \
 		  IceSSL \
-		  IceDiscovery
+		  IceDiscovery \
+		  Glacier2Lib \
+		  IceStormLib \
+		  IceGridLib
 else
 
 ifneq ($(findstring MINGW,$(UNAME)),)
diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak
index 3dea3e0f4e7..5e0296b48b3 100644
--- a/cpp/src/Makefile.mak
+++ b/cpp/src/Makefile.mak
@@ -24,7 +24,10 @@ SUBDIRS		= IceUtil \
 		  slice2cpp \
 		  Ice \
 		  IceSSL \
-		  IceDiscovery
+		  IceDiscovery \
+		  Glacier2Lib \
+		  IceStormLib \
+		  IceGridLib
 !elseif "$(CPP_COMPILER)" == "VC100"
 SUBDIRS		= IceUtil \
 		  Slice \
-- 
cgit v1.2.3