summaryrefslogtreecommitdiff
path: root/cpp/demo
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-03-02 15:23:53 -0330
committerDwayne Boone <dwayne@zeroc.com>2009-03-02 15:23:53 -0330
commit8b15e6ba73a45b5be5064cb2f866ad0654d7af18 (patch)
tree9ee591d38fb7725ab2e6ef637b46b54d1394ef33 /cpp/demo
parentFix 3755 - demo/Ice/callback has context parameter? (diff)
downloadice-8b15e6ba73a45b5be5064cb2f866ad0654d7af18.tar.bz2
ice-8b15e6ba73a45b5be5064cb2f866ad0654d7af18.tar.xz
ice-8b15e6ba73a45b5be5064cb2f866ad0654d7af18.zip
C++Builder 2009 port
Diffstat (limited to 'cpp/demo')
-rw-r--r--cpp/demo/Freeze/library/Parser.cpp3
-rw-r--r--cpp/demo/Glacier2/callback/Client.cpp3
-rw-r--r--cpp/demo/Glacier2/chat/Client.cpp3
-rw-r--r--cpp/demo/Ice/Makefile.mak2
-rw-r--r--cpp/demo/IceGrid/allocate/Client.cpp6
-rw-r--r--cpp/demo/IceGrid/secure/Client.cpp3
-rw-r--r--cpp/demo/IceGrid/sessionActivation/Client.cpp5
-rw-r--r--cpp/demo/IceGrid/simple/Client.cpp3
-rw-r--r--cpp/demo/IceStorm/clock/Publisher.cpp6
-rw-r--r--cpp/demo/IceStorm/clock/Subscriber.cpp8
-rw-r--r--cpp/demo/IceStorm/counter/Server.cpp3
-rw-r--r--cpp/demo/IceStorm/replicated/Publisher.cpp6
-rw-r--r--cpp/demo/IceStorm/replicated/Subscriber.cpp6
-rw-r--r--cpp/demo/IceStorm/replicated2/Subscriber.cpp3
-rw-r--r--cpp/demo/Makefile.mak2
-rw-r--r--cpp/demo/book/lifecycle/Parser.cpp3
16 files changed, 61 insertions, 4 deletions
diff --git a/cpp/demo/Freeze/library/Parser.cpp b/cpp/demo/Freeze/library/Parser.cpp
index 98e800e0106..a98f0d952bb 100644
--- a/cpp/demo/Freeze/library/Parser.cpp
+++ b/cpp/demo/Freeze/library/Parser.cpp
@@ -171,6 +171,9 @@ Parser::printCurrent()
string renter;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
renter = (*_current)->getRenterName();
}
catch(const BookNotRentedException&)
diff --git a/cpp/demo/Glacier2/callback/Client.cpp b/cpp/demo/Glacier2/callback/Client.cpp
index 77413707088..f40bc92247a 100644
--- a/cpp/demo/Glacier2/callback/Client.cpp
+++ b/cpp/demo/Glacier2/callback/Client.cpp
@@ -92,6 +92,9 @@ CallbackClient::run(int argc, char* argv[])
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
router->createSession(id, pw);
break;
}
diff --git a/cpp/demo/Glacier2/chat/Client.cpp b/cpp/demo/Glacier2/chat/Client.cpp
index c81a77525d5..48376244329 100644
--- a/cpp/demo/Glacier2/chat/Client.cpp
+++ b/cpp/demo/Glacier2/chat/Client.cpp
@@ -140,6 +140,9 @@ public:
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
session = ChatSessionPrx::uncheckedCast(_router->createSession(id, pw));
break;
}
diff --git a/cpp/demo/Ice/Makefile.mak b/cpp/demo/Ice/Makefile.mak
index d563f36a154..1ee00a3c859 100644
--- a/cpp/demo/Ice/Makefile.mak
+++ b/cpp/demo/Ice/Makefile.mak
@@ -26,7 +26,7 @@ SUBDIRS = minimal \
multicast \
nrvo
-!if "$(CPP_COMPILER)" != "BCC2007" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && "$(CPP_COMPILER)" != "VC90_EXPRESS"
+!if "$(BCPLUSPLUS)" != "yes" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && "$(CPP_COMPILER)" != "VC90_EXPRESS"
SUBDIRS = $(SUBDIRS) MFC
!endif
diff --git a/cpp/demo/IceGrid/allocate/Client.cpp b/cpp/demo/IceGrid/allocate/Client.cpp
index 0de09584229..7bd1f562fbc 100644
--- a/cpp/demo/IceGrid/allocate/Client.cpp
+++ b/cpp/demo/IceGrid/allocate/Client.cpp
@@ -132,6 +132,9 @@ HelloClient::run(int argc, char* argv[])
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
session = registry->createSession(id, password);
break;
}
@@ -155,6 +158,9 @@ HelloClient::run(int argc, char* argv[])
HelloPrx hello;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
hello = HelloPrx::checkedCast(session->allocateObjectById(communicator()->stringToIdentity("hello")));
}
catch(const IceGrid::ObjectNotRegisteredException&)
diff --git a/cpp/demo/IceGrid/secure/Client.cpp b/cpp/demo/IceGrid/secure/Client.cpp
index 450b7bf773a..871f0f08a65 100644
--- a/cpp/demo/IceGrid/secure/Client.cpp
+++ b/cpp/demo/IceGrid/secure/Client.cpp
@@ -59,6 +59,9 @@ HelloClient::run(int argc, char* argv[])
HelloPrx hello;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
hello = HelloPrx::checkedCast(communicator()->stringToProxy("hello"));
}
catch(const Ice::NotRegisteredException&)
diff --git a/cpp/demo/IceGrid/sessionActivation/Client.cpp b/cpp/demo/IceGrid/sessionActivation/Client.cpp
index 0307a9e38d3..f93a811864e 100644
--- a/cpp/demo/IceGrid/sessionActivation/Client.cpp
+++ b/cpp/demo/IceGrid/sessionActivation/Client.cpp
@@ -130,7 +130,10 @@ HelloClient::run(int argc, char* argv[])
password = trim(password);
try
- {
+ {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
session = registry->createSession(id, password);
break;
}
diff --git a/cpp/demo/IceGrid/simple/Client.cpp b/cpp/demo/IceGrid/simple/Client.cpp
index 450b7bf773a..871f0f08a65 100644
--- a/cpp/demo/IceGrid/simple/Client.cpp
+++ b/cpp/demo/IceGrid/simple/Client.cpp
@@ -59,6 +59,9 @@ HelloClient::run(int argc, char* argv[])
HelloPrx hello;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
hello = HelloPrx::checkedCast(communicator()->stringToProxy("hello"));
}
catch(const Ice::NotRegisteredException&)
diff --git a/cpp/demo/IceStorm/clock/Publisher.cpp b/cpp/demo/IceStorm/clock/Publisher.cpp
index c341212c100..74f13ebef61 100644
--- a/cpp/demo/IceStorm/clock/Publisher.cpp
+++ b/cpp/demo/IceStorm/clock/Publisher.cpp
@@ -98,12 +98,18 @@ Publisher::run(int argc, char* argv[])
IceStorm::TopicPrx topic;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->retrieve(topicName);
}
catch(const IceStorm::NoSuchTopic&)
{
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->create(topicName);
}
catch(const IceStorm::TopicExists&)
diff --git a/cpp/demo/IceStorm/clock/Subscriber.cpp b/cpp/demo/IceStorm/clock/Subscriber.cpp
index 523a1c02440..5a12c8cf23b 100644
--- a/cpp/demo/IceStorm/clock/Subscriber.cpp
+++ b/cpp/demo/IceStorm/clock/Subscriber.cpp
@@ -160,13 +160,19 @@ Subscriber::run(int argc, char* argv[])
IceStorm::TopicPrx topic;
try
- {
+ {
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->retrieve(topicName);
}
catch(const IceStorm::NoSuchTopic&)
{
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->create(topicName);
}
catch(const IceStorm::TopicExists&)
diff --git a/cpp/demo/IceStorm/counter/Server.cpp b/cpp/demo/IceStorm/counter/Server.cpp
index 66309878007..a2f46c263ed 100644
--- a/cpp/demo/IceStorm/counter/Server.cpp
+++ b/cpp/demo/IceStorm/counter/Server.cpp
@@ -53,6 +53,9 @@ Server::run(int argc, char* argv[])
IceStorm::TopicPrx topic;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->retrieve("counter");
}
catch(const IceStorm::NoSuchTopic&)
diff --git a/cpp/demo/IceStorm/replicated/Publisher.cpp b/cpp/demo/IceStorm/replicated/Publisher.cpp
index c341212c100..74f13ebef61 100644
--- a/cpp/demo/IceStorm/replicated/Publisher.cpp
+++ b/cpp/demo/IceStorm/replicated/Publisher.cpp
@@ -98,12 +98,18 @@ Publisher::run(int argc, char* argv[])
IceStorm::TopicPrx topic;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->retrieve(topicName);
}
catch(const IceStorm::NoSuchTopic&)
{
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->create(topicName);
}
catch(const IceStorm::TopicExists&)
diff --git a/cpp/demo/IceStorm/replicated/Subscriber.cpp b/cpp/demo/IceStorm/replicated/Subscriber.cpp
index 523a1c02440..d4b6cfdf1a5 100644
--- a/cpp/demo/IceStorm/replicated/Subscriber.cpp
+++ b/cpp/demo/IceStorm/replicated/Subscriber.cpp
@@ -161,12 +161,18 @@ Subscriber::run(int argc, char* argv[])
IceStorm::TopicPrx topic;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->retrieve(topicName);
}
catch(const IceStorm::NoSuchTopic&)
{
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->create(topicName);
}
catch(const IceStorm::TopicExists&)
diff --git a/cpp/demo/IceStorm/replicated2/Subscriber.cpp b/cpp/demo/IceStorm/replicated2/Subscriber.cpp
index bf235ab47c3..ae8f0a8cdf2 100644
--- a/cpp/demo/IceStorm/replicated2/Subscriber.cpp
+++ b/cpp/demo/IceStorm/replicated2/Subscriber.cpp
@@ -161,6 +161,9 @@ Subscriber::run(int argc, char* argv[])
IceStorm::TopicPrx topic;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
topic = manager->retrieve(topicName);
}
catch(const IceStorm::NoSuchTopic&)
diff --git a/cpp/demo/Makefile.mak b/cpp/demo/Makefile.mak
index 92b6e5b4c61..2451eeefe64 100644
--- a/cpp/demo/Makefile.mak
+++ b/cpp/demo/Makefile.mak
@@ -20,7 +20,7 @@ SUBDIRS = IceUtil \
IceGrid \
book
-!if "$(CPP_COMPILER)" != "BCC2007" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && "$(CPP_COMPILER)" != "VC90_EXPRESS"
+!if "$(BCPLUSPLUS)" != "yes" && "$(CPP_COMPILER)" != "VC80_EXPRESS" && "$(CPP_COMPILER)" != "VC90_EXPRESS"
SUBDIRS = $(SUBDIRS) IcePatch2
!endif
diff --git a/cpp/demo/book/lifecycle/Parser.cpp b/cpp/demo/book/lifecycle/Parser.cpp
index cb4c3411d97..153490cb50c 100644
--- a/cpp/demo/book/lifecycle/Parser.cpp
+++ b/cpp/demo/book/lifecycle/Parser.cpp
@@ -174,6 +174,9 @@ Parser::cd(const string& name)
NodeDesc d;
try
{
+#if defined(__BCPLUSPLUS__) && (__BCPLUSPLUS__ >= 0x0600)
+ IceUtil::DummyBCC dummy;
+#endif
d = dir->find(name);
}
catch(const NoSuchName&)
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 21:12:30 +0000