summaryrefslogtreecommitdiff
path: root/cppe
diff options
context:
space:
mode:
Diffstat (limited to 'cppe')
-rw-r--r--cppe/all.dsw2
-rw-r--r--cppe/demo/IceE/hello/Client.cpp11
-rwxr-xr-xcppe/demo/IceE/hello/helloC.dsp24
-rw-r--r--cppe/include/IceE/Config.h6
-rwxr-xr-xcppe/src/IceEC/icec.dsp8
5 files changed, 27 insertions, 24 deletions
diff --git a/cppe/all.dsw b/cppe/all.dsw
index e96287ff2b4..ba636d7607f 100644
--- a/cppe/all.dsw
+++ b/cppe/all.dsw
@@ -426,7 +426,7 @@ Package=<5>
Package=<4>
{{{
Begin Project Dependency
- Project_Dep_Name ice
+ Project_Dep_Name icec
End Project Dependency
}}}
diff --git a/cppe/demo/IceE/hello/Client.cpp b/cppe/demo/IceE/hello/Client.cpp
index 2d51fc46aea..e4a31dad3c0 100644
--- a/cppe/demo/IceE/hello/Client.cpp
+++ b/cppe/demo/IceE/hello/Client.cpp
@@ -9,7 +9,7 @@
#include <IceE/IceE.h>
#include <Hello.h>
-
+
using namespace std;
using namespace Demo;
@@ -19,8 +19,10 @@ menu()
printf("usage:\n");
printf("t: send greeting as twoway\n");
printf("o: send greeting as oneway\n");
+#ifdef ICEE_HAS_BATCH
printf("O: send greeting as batch oneway\n");
printf("f: flush all batch requests\n");
+#endif
printf("T: set a timeout\n");
printf("s: shutdown server\n");
printf("x: exit\n");
@@ -47,7 +49,9 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
return EXIT_FAILURE;
}
HelloPrx oneway = HelloPrx::uncheckedCast(twoway->ice_oneway());
+#ifdef ICEE_HAS_BATCH
HelloPrx batchOneway = HelloPrx::uncheckedCast(twoway->ice_batchOneway());
+#endif
int timeout = -1;
@@ -72,6 +76,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
{
oneway->sayHello();
}
+#ifdef ICEE_HAS_BATCH
else if(c == 'O')
{
batchOneway->sayHello();
@@ -80,6 +85,7 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
{
communicator->flushBatchRequests();
}
+#endif
else if(c == 'T')
{
if(timeout == -1)
@@ -93,8 +99,9 @@ run(int argc, char* argv[], const Ice::CommunicatorPtr& communicator)
twoway = HelloPrx::uncheckedCast(twoway->ice_timeout(timeout));
oneway = HelloPrx::uncheckedCast(oneway->ice_timeout(timeout));
+#ifdef ICEE_HAS_BATCH
batchOneway = HelloPrx::uncheckedCast(batchOneway->ice_timeout(timeout));
-
+#endif
if(timeout == -1)
{
printf("timeout is now switched off\n");
diff --git a/cppe/demo/IceE/hello/helloC.dsp b/cppe/demo/IceE/hello/helloC.dsp
index e87d1fc9aae..a32a277e7fa 100755
--- a/cppe/demo/IceE/hello/helloC.dsp
+++ b/cppe/demo/IceE/hello/helloC.dsp
@@ -39,12 +39,12 @@ RSC=rc.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
+# PROP Output_Dir "ReleaseC"
+# PROP Intermediate_Dir "ReleaseC"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /D "NDEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
@@ -65,12 +65,12 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
+# PROP Output_Dir "DebugC"
+# PROP Intermediate_Dir "DebugC"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_DEBUG" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -92,13 +92,13 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "DebugStatic"
-# PROP Intermediate_Dir "DebugStatic"
+# PROP Output_Dir "DebugStaticC"
+# PROP Intermediate_Dir "DebugStaticC"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /I "../../../include/stlport" /D "_DEBUG" /D "_CONSOLE" /FD /GZ /c
# SUBTRACT BASE CPP /Fr /YX
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I "." /I "../../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "_DEBUG"
# ADD RSC /l 0x409 /d "_DEBUG"
@@ -121,13 +121,13 @@ LINK32=link.exe
# PROP BASE Target_Dir ""
# PROP Use_MFC 0
# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ReleaseStatic"
-# PROP Intermediate_Dir "ReleaseStatic"
+# PROP Output_Dir "ReleaseStaticC"
+# PROP Intermediate_Dir "ReleaseStaticC"
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MD /W3 /WX /GR /GX /O2 /I "." /I "../../../include" /I "../../../include/stlport" /D "NDEBUG" /D "_CONSOLE" /FD /c
# SUBTRACT BASE CPP /Fr /YX
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I "." /I "../../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "WIN32_LEAN_AND_MEAN" /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c
# SUBTRACT CPP /Fr /YX
# ADD BASE RSC /l 0x409 /d "NDEBUG"
# ADD RSC /l 0x409 /d "NDEBUG"
diff --git a/cppe/include/IceE/Config.h b/cppe/include/IceE/Config.h
index 86faf505f5a..3f25c59e297 100644
--- a/cppe/include/IceE/Config.h
+++ b/cppe/include/IceE/Config.h
@@ -13,18 +13,18 @@
//
// Comment this out if you want to build without Router support.
//
-//#define ICEE_HAS_ROUTER
+#define ICEE_HAS_ROUTER
//
// Comment this out if you want to build without Locator support.
//
-//#define ICEE_HAS_LOCATOR
+#define ICEE_HAS_LOCATOR
//
// Comment this out if you want to build without batch mode on the
// client side.
//
-//#define ICEE_HAS_BATCH
+#define ICEE_HAS_BATCH
// ***********************************************************************
diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index 305873909eb..c8fbb61bd80 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -133,7 +133,7 @@ LIB32=link.exe -lib
# Begin Special Build Tool
OutDir=.\ReleaseStatic
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\iceec.lib ..\..\lib\
+PostBuild_Cmds=copy $(OutDir)\iceec.lib ..\..\lib\
# End Special Build Tool
!ELSEIF "$(CFG)" == "icec - Win32 Debug Static"
@@ -166,7 +166,7 @@ LIB32=link.exe -lib
# Begin Special Build Tool
OutDir=.\DebugStatic
SOURCE="$(InputPath)"
-PostBuild_Cmds=copy $(OutDir)\iceecd.lib ..\..\lib\
+PostBuild_Cmds=copy $(OutDir)\iceecd.lib ..\..\lib\
# End Special Build Tool
!ENDIF
@@ -430,10 +430,6 @@ SOURCE=..\..\include\IceE\Config.h
# End Source File
# Begin Source File
-SOURCE=..\..\include\IceE\Config.h
-# End Source File
-# Begin Source File
-
SOURCE=..\..\include\IceE\Connection.h
# End Source File
# Begin Source File
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-06 05:43:47 +0000