summaryrefslogtreecommitdiff
path: root/cpp/demo
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo')
-rw-r--r--cpp/demo/Freeze/bench/Client.cpp73
-rw-r--r--cpp/demo/Freeze/casino/BankI.cpp7
-rw-r--r--cpp/demo/Freeze/casino/BankI.h8
-rw-r--r--cpp/demo/Freeze/casino/BetResolver.h9
-rw-r--r--cpp/demo/Freeze/casino/Server.cpp13
-rw-r--r--cpp/demo/Ice/Makefile.mak6
-rw-r--r--cpp/demo/IceGrid/Makefile.mak5
-rw-r--r--cpp/demo/Makefile.mak12
-rw-r--r--cpp/demo/book/Makefile.mak6
9 files changed, 6 insertions, 133 deletions
diff --git a/cpp/demo/Freeze/bench/Client.cpp b/cpp/demo/Freeze/bench/Client.cpp
index 2b20779bcf4..d27dcad0efc 100644
--- a/cpp/demo/Freeze/bench/Client.cpp
+++ b/cpp/demo/Freeze/bench/Client.cpp
@@ -166,11 +166,7 @@ private:
Freeze::TransactionHolder txHolder(_connection);
for(i = 0; i < _repetitions; ++i)
{
-#if (defined(_MSC_VER) && (_MSC_VER < 1310))
- m.put(T::value_type(i, i));
-#else
m.put(typename T::value_type(i, i));
-#endif
}
txHolder.commit();
}
@@ -268,12 +264,7 @@ private:
os << i;
s2.s = os.str();
s2.s1 = s1;
-
-#if (defined(_MSC_VER) && (_MSC_VER < 1310))
- m.put(T::value_type(s1, s2));
-#else
m.put(typename T::value_type(s1, s2));
-#endif
}
txHolder.commit();
}
@@ -350,11 +341,7 @@ private:
ostringstream os;
os << i;
c1->s = os.str();
-#if (defined(_MSC_VER) && (_MSC_VER < 1310))
- m.put(T::value_type(s1, c1));
-#else
m.put(typename T::value_type(s1, c1));
-#endif
}
txHolder.commit();
}
@@ -425,11 +412,7 @@ private:
Freeze::TransactionHolder txHolder(_connection);
for(i = 0; i < _repetitions; ++i)
{
-#if (defined(_MSC_VER) && (_MSC_VER < 1310))
- m.put(T::value_type(i, i));
-#else
m.put(typename T::value_type(i, i));
-#endif
}
txHolder.commit();
}
@@ -720,64 +703,22 @@ TestApp::run(int argc, char* argv[])
_connection = Freeze::createConnection(communicator(), _envName);
cout << "IntIntMap" << endl;
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
- {
- IntIntMap* dummy = 0;
- IntIntMapTest("IntIntMap", dummy);
- }
-#else
IntIntMapTest<IntIntMap>("IntIntMap");
-#endif
cout << "IntIntMap with index" << endl;
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
- {
- IndexedIntIntMap* dummy = 0;
- IntIntMapTest("IndexedIntIntMap", dummy);
- }
-#else
IntIntMapTest<IndexedIntIntMap>("IndexedIntIntMap");
-#endif
cout <<"Struct1Struct2Map" << endl;
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
- {
- Struct1Struct2Map* dummy = 0;
- Struct1Struct2MapTest("Struct1Struct2Map", dummy);
- }
-#else
Struct1Struct2MapTest<Struct1Struct2Map>("Struct1Struct2Map");
-#endif
cout <<"Struct1Struct2Map with index" << endl;
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
- {
- IndexedStruct1Struct2Map* dummy = 0;
- Struct1Struct2MapTest("IndexedStruct1Struct2Map", dummy);
- }
-#else
Struct1Struct2MapTest<IndexedStruct1Struct2Map>("IndexedStruct1Struct2Map");
-#endif
cout <<"Struct1Class1Map" << endl;
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
- {
- Struct1Class1Map* dummy = 0;
- Struct1Class1MapTest("Struct1Class1Map", dummy);
- }
-#else
Struct1Class1MapTest<Struct1Class1Map>("Struct1Class1Map");
-#endif
cout <<"Struct1Class1Map with index" << endl;
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
- {
- IndexedStruct1Class1Map* dummy = 0;
- Struct1Class1MapTest("IndexedStruct1Class1Map", dummy);
- }
-#else
Struct1Class1MapTest<IndexedStruct1Class1Map>("IndexedStruct1Class1Map");
-#endif
MyFactoryPtr factory = new MyFactory();
@@ -785,24 +726,10 @@ TestApp::run(int argc, char* argv[])
Struct1ObjectMapTest();
cout <<"IntIntMap (read test)" << endl;
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
- {
- IntIntMap* dummy = 0;
- IntIntMapReadTest("IntIntMap", dummy);
- }
-#else
IntIntMapReadTest<IntIntMap>("IntIntMap");
-#endif
cout <<"IntIntMap with index (read test)" << endl;
-#if defined(_MSC_VER) && (_MSC_VER < 1310)
- {
- IndexedIntIntMap* dummy = 0;
- IntIntMapReadTest("IndexedIntIntMap", dummy);
- }
-#else
IntIntMapReadTest<IndexedIntIntMap>("IndexedIntIntMap");
-#endif
_connection->close();
diff --git a/cpp/demo/Freeze/casino/BankI.cpp b/cpp/demo/Freeze/casino/BankI.cpp
index d1047b51616..ef70ac71ad0 100644
--- a/cpp/demo/Freeze/casino/BankI.cpp
+++ b/cpp/demo/Freeze/casino/BankI.cpp
@@ -101,14 +101,7 @@ BankI::checkAllChips(const Ice::Current& current) const
Casino::BetPrx
BankI::createBet(int amount, int lifetime, const Ice::Current&)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- Ice::Identity ident;
- ident.name = IceUtil::generateUUID();
- ident.category = "bet";
-#else
Ice::Identity ident = { IceUtil::generateUUID(), "bet" };
-#endif
-
Ice::Long closeTime = IceUtil::Time::now().toMilliSeconds() + lifetime;
outstandingChips += amount;
diff --git a/cpp/demo/Freeze/casino/BankI.h b/cpp/demo/Freeze/casino/BankI.h
index 99cd3d6126f..977496db8ba 100644
--- a/cpp/demo/Freeze/casino/BankI.h
+++ b/cpp/demo/Freeze/casino/BankI.h
@@ -53,14 +53,6 @@ public:
private:
std::vector<CasinoStore::PersistentBetPrx> getBets(const Ice::ObjectAdapterPtr&) const;
-
-#if (defined(_MSC_VER) && (_MSC_VER < 1300))
-//
-// Some compilers don't let local classes access private data members
-//
-public:
-#endif
-
CasinoStore::PersistentBankPrx _prx;
Freeze::TransactionalEvictorPtr _evictor;
Freeze::TransactionalEvictorPtr _playerEvictor;
diff --git a/cpp/demo/Freeze/casino/BetResolver.h b/cpp/demo/Freeze/casino/BetResolver.h
index 5c05b2e44a8..0004ee55578 100644
--- a/cpp/demo/Freeze/casino/BetResolver.h
+++ b/cpp/demo/Freeze/casino/BetResolver.h
@@ -30,17 +30,10 @@ public:
int getBetCount() const;
-#if (!defined(_MSC_VER) || (_MSC_VER >= 1300))
-//
-// Some compilers don't let local classes access private members
-//
private:
-#endif
void decrementBetCount();
-
-private:
-
+
int _betCount;
IceUtil::Mutex _mutex;
std::vector<IceUtil::TimerPtr> _timers;
diff --git a/cpp/demo/Freeze/casino/Server.cpp b/cpp/demo/Freeze/casino/Server.cpp
index d8f1a937d08..1ae1b9ed42c 100644
--- a/cpp/demo/Freeze/casino/Server.cpp
+++ b/cpp/demo/Freeze/casino/Server.cpp
@@ -30,13 +30,6 @@ private:
map<string, string> createTypeMap(const string&);
const string _envName;
-#if (defined(_MSC_VER) && (_MSC_VER < 1300))
-//
-// Some compilers don't let local classes access private data members
-//
-public:
-#endif
-
CasinoStore::PersistentBankPrx _bankPrx;
Freeze::TransactionalEvictorPtr _bankEvictor;
Freeze::TransactionalEvictorPtr _playerEvictor;
@@ -269,13 +262,7 @@ CasinoServer::run(int argc, char* argv[])
for(size_t i = 0; i < 12; ++i)
{
-#if defined(_MSC_VER) && (_MSC_VER < 1300)
- Ice::Identity ident;
- ident.name = players[i];
- ident.category = "player";
-#else
Ice::Identity ident = { players[i], "player" };
-#endif
if(!_playerEvictor->hasObject(ident))
{
_playerEvictor->add(new PlayerI, ident);
diff --git a/cpp/demo/Ice/Makefile.mak b/cpp/demo/Ice/Makefile.mak
index 456991f4552..3ada5055c45 100644
--- a/cpp/demo/Ice/Makefile.mak
+++ b/cpp/demo/Ice/Makefile.mak
@@ -25,12 +25,8 @@ SUBDIRS = minimal \
multicast \
nrvo \
plugin \
- interleaved
-
-!if "$(CPP_COMPILER)" != "VC60"
-SUBDIRS = $(SUBDIRS) \
+ interleaved \
invoke
-!endif
!if "$(BCPLUSPLUS)" != "yes" && "$(CPP_COMPILER)" != "VC90_EXPRESS" && "$(CPP_COMPILER)" != "VC100_EXPRESS"
SUBDIRS = $(SUBDIRS) \
diff --git a/cpp/demo/IceGrid/Makefile.mak b/cpp/demo/IceGrid/Makefile.mak
index 9302edca8cf..2a79d6ef035 100644
--- a/cpp/demo/IceGrid/Makefile.mak
+++ b/cpp/demo/IceGrid/Makefile.mak
@@ -15,10 +15,7 @@ SUBDIRS = allocate \
sessionActivation \
simple \
replication \
- secure
-
-!if "$(BCPLUSPLUS)" != "yes" && "$(CPP_COMPILER)" != "VC60"
-SUBDIRS = $(SUBDIRS) \
+ secure \
icebox
!endif
diff --git a/cpp/demo/Makefile.mak b/cpp/demo/Makefile.mak
index 8b52cc6b9df..37876dda9b6 100644
--- a/cpp/demo/Makefile.mak
+++ b/cpp/demo/Makefile.mak
@@ -13,22 +13,14 @@ top_srcdir = ..
SUBDIRS = IceUtil \
Ice \
- book
-
-
-!if "$(CPP_COMPILER)" != "VC60"
-SUBDIRS = $(SUBDIRS) \
+ book \
Glacier2 \
Freeze \
IceStorm \
IceGrid \
-
-!if "$(BCPLUSPLUS)" != "yes"
-SUBDIRS = $(SUBDIRS) \
IceBox
-!endif
-!if "$(BCPLUSPLUS)" != "yes" && "$(CPP_COMPILER)" != "VC90_EXPRESS" && "$(CPP_COMPILER)" != "VC100_EXPRESS"
+!if "$(CPP_COMPILER)" != "VC100_EXPRESS" && "$(CPP_COMPILER)" != "VC110_EXPRESS"
SUBDIRS = $(SUBDIRS) \
IcePatch2
!endif
diff --git a/cpp/demo/book/Makefile.mak b/cpp/demo/book/Makefile.mak
index d95c22aaf39..c59f3a1274b 100644
--- a/cpp/demo/book/Makefile.mak
+++ b/cpp/demo/book/Makefile.mak
@@ -13,13 +13,9 @@ top_srcdir = ..\..
SUBDIRS = printer \
simple_filesystem \
- lifecycle
-
-!if "$(CPP_COMPILER)" != "VC60"
-SUBDIRS = $(SUBDIRS) \
+ lifecycle \
map_filesystem \
evictor_filesystem
-!endif
$(EVERYTHING)::
@for %i in ( $(SUBDIRS) ) do \
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-03 18:57:40 +0000