fix problem with building with locator support.

3 files changed, 139 insertions, 70 deletions

diff --git a/cppe/src/IceE/LocatorInfoF.h b/cppe/src/IceE/LocatorInfoF.h
deleted file mode 100644
index 14118fe4804..00000000000
--- a/cppe/src/IceE/LocatorInfoF.h
+++ /dev/null
@@ -1,41 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
-//
-// This copy of Ice is licensed to you under the terms described in the
-// ICEE_LICENSE file included in this distribution.
-//
-// **********************************************************************
-
-#ifndef ICEE_LOCATOR_INFO_F_H
-#define ICEE_LOCATOR_INFO_F_H
-
-#include <IceE/Config.h>
-
-#ifndef ICEE_NO_LOCATOR
-
-#include <IceE/Handle.h>
-
-namespace IceEInternal
-{
-
-class LocatorManager;
-void incRef(LocatorManager*);
-void decRef(LocatorManager*);
-typedef Handle<LocatorManager> LocatorManagerPtr;
-
-class LocatorInfo;
-void incRef(LocatorInfo*);
-void decRef(LocatorInfo*);
-typedef Handle<LocatorInfo> LocatorInfoPtr;
-
-class LocatorTable;
-void incRef(LocatorTable*);
-void decRef(LocatorTable*);
-typedef Handle<LocatorTable> LocatorTablePtr;
-
-}
-
-#endif
-
-#endif
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index f81fb61acfc..3764093e2c0 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -147,7 +147,7 @@ IceE::ObjectAdapter::activate()
 	}
 	catch(const AdapterAlreadyActiveException&)
 	{
-	    ObjectAdapterdInUseException ex(__FILE__, __LINE__);
+	    ObjectAdapterIdInUseException ex(__FILE__, __LINE__);
 	    ex.id = _id;
 	    throw ex;
 	}
diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index d929fed1fea..b5826e3bcbc 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -258,6 +258,10 @@ SOURCE=..\IceE\LocalObject.cpp
 # End Source File

 # Begin Source File

 

+SOURCE=.\Locator.cpp

+# End Source File

+# Begin Source File

+

 SOURCE=..\IceE\LocatorInfo.cpp

 # End Source File

 # Begin Source File

@@ -318,14 +322,6 @@ SOURCE=..\IceE\ReferenceFactory.cpp
 # End Source File

 # Begin Source File

 

-SOURCE=..\IceE\RouterInfo.cpp

-# End Source File

-# Begin Source File

-

-SOURCE=..\IceE\RoutingTable.cpp

-# End Source File

-# Begin Source File

-

 SOURCE=..\IceE\RWRecMutex.cpp

 # End Source File

 # Begin Source File

@@ -546,6 +542,14 @@ SOURCE=..\..\include\IceE\LocalObjectF.h
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\include\IceE\Locator.h

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\include\IceE\LocatorF.h

+# End Source File

+# Begin Source File

+

 SOURCE=..\IceE\LocatorInfo.h

 # End Source File

 # Begin Source File

@@ -654,26 +658,6 @@ SOURCE=..\IceE\ReferenceFactoryF.h
 # End Source File

 # Begin Source File

 

-SOURCE=..\..\include\IceE\RouterInfo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\IceE\RouterInfo.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\IceE\RouterInfoF.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IceE\RoutingTable.h

-# End Source File

-# Begin Source File

-

-SOURCE=..\..\include\IceE\RoutingTableF.h

-# End Source File

-# Begin Source File

-

 SOURCE=..\..\include\IceE\RWRecMutex.h

 # End Source File

 # Begin Source File

@@ -975,6 +959,132 @@ BuildCmds= \
 # End Source File

 # Begin Source File

 

+SOURCE=..\..\slice\IceE\Locator.ice

+

+!IF  "$(CFG)" == "icec - Win32 Release"

+

+# Begin Custom Build

+InputPath=..\..\slice\IceE\Locator.ice

+

+BuildCmds= \

+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \

+	move Locator.h ..\..\include\icee \

+	

+

+"..\..\include\icee\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "icec - Win32 Debug"

+

+# Begin Custom Build

+InputPath=..\..\slice\IceE\Locator.ice

+

+BuildCmds= \

+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \

+	move Locator.h ..\..\include\icee \

+	

+

+"..\..\include\icee\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "icec - Win32 Release Static"

+

+# Begin Custom Build

+InputPath=..\..\slice\IceE\Locator.ice

+

+BuildCmds= \

+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \

+	move Locator.h ..\..\include\icee \

+	

+

+"..\..\include\icee\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "icec - Win32 Debug Static"

+

+# Begin Custom Build

+InputPath=..\..\slice\IceE\Locator.ice

+

+BuildCmds= \

+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \

+	move Locator.h ..\..\include\icee \

+	

+

+"..\..\include\icee\Locator.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+

+"Locator.cpp" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+   $(BuildCmds)

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

+SOURCE=..\..\slice\IceE\LocatorF.ice

+

+!IF  "$(CFG)" == "icec - Win32 Release"

+

+# Begin Custom Build

+InputPath=..\..\slice\IceE\LocatorF.ice

+

+"..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 

+	move LocatorF.h ..\..\include\icee 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "icec - Win32 Debug"

+

+# Begin Custom Build

+InputPath=..\..\slice\IceE\LocatorF.ice

+

+"..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 

+	move LocatorF.h ..\..\include\icee 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "icec - Win32 Release Static"

+

+# Begin Custom Build

+InputPath=..\..\slice\IceE\LocatorF.ice

+

+"..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 

+	move LocatorF.h ..\..\include\icee 

+	

+# End Custom Build

+

+!ELSEIF  "$(CFG)" == "icec - Win32 Debug Static"

+

+# Begin Custom Build

+InputPath=..\..\slice\IceE\LocatorF.ice

+

+"..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"

+	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 

+	move LocatorF.h ..\..\include\icee 

+	

+# End Custom Build

+

+!ENDIF 

+

+# End Source File

+# Begin Source File

+

 SOURCE=..\..\slice\IceE\Logger.ice

 

 !IF  "$(CFG)" == "icec - Win32 Release"