diff options
| author | Matthew Newhook <matthew@zeroc.com> | 2008-03-12 15:03:23 +0800 |
|---|---|---|
| committer | Matthew Newhook <matthew@zeroc.com> | 2008-03-12 15:03:23 +0800 |
| commit | 7b556a63485c73cd12c5fd907ce4f22cc9201f0c (patch) | |
| tree | 03860bca6803761a32debc26d4b05325b4ef37a6 | |
| parent | http://bugzilla/bugzilla/show_bug.cgi?id=2715 (diff) | |
| download | ice-7b556a63485c73cd12c5fd907ce4f22cc9201f0c.tar.bz2 ice-7b556a63485c73cd12c5fd907ce4f22cc9201f0c.tar.xz ice-7b556a63485c73cd12c5fd907ce4f22cc9201f0c.zip | |
Fixed some VC60 compilation bugs. Removed upgradeicestorm.py from the installation targets.
| -rw-r--r-- | cpp/config/Makefile | 1 | ||||
| -rw-r--r-- | cpp/config/Makefile.mak | 1 | ||||
| -rw-r--r-- | cpp/test/Ice/hold/AllTests.cpp | 9 |
3 files changed, 5 insertions, 6 deletions
diff --git a/cpp/config/Makefile b/cpp/config/Makefile index be9ce2da64c..0918e93a773 100644 --- a/cpp/config/Makefile +++ b/cpp/config/Makefile @@ -23,6 +23,5 @@ install:: $(call installdata,templates.xml,$(prefix)/config) $(call installdata,convertssl.py,$(prefix)/config) $(call installdata,upgradeicegrid.py,$(prefix)/config) - $(call installdata,upgradeicestorm.py,$(prefix)/config) $(call installdata,icegrid-slice.3.1.ice.gz,$(prefix)/config) diff --git a/cpp/config/Makefile.mak b/cpp/config/Makefile.mak index f61594c1c78..5c3d3bc32e6 100644 --- a/cpp/config/Makefile.mak +++ b/cpp/config/Makefile.mak @@ -20,7 +20,6 @@ install:: copy templates.xml $(prefix)\config copy convertssl.py $(prefix)\config copy upgradeicegrid.py $(prefix)\config - copy upgradeicestorm.py $(prefix)\config copy icegridregistry.cfg $(prefix)\config copy icegridnode.cfg $(prefix)\config copy glacier2router.cfg $(prefix)\config diff --git a/cpp/test/Ice/hold/AllTests.cpp b/cpp/test/Ice/hold/AllTests.cpp index a35c66f3ced..cabfe109a87 100644 --- a/cpp/test/Ice/hold/AllTests.cpp +++ b/cpp/test/Ice/hold/AllTests.cpp @@ -129,19 +129,20 @@ allTests(const Ice::CommunicatorPtr& communicator) cout << "ok" << endl; cout << "changing state between active and hold rapidly... " << flush; - for(int i = 0; i < 100; ++i) + int i; + for(i = 0; i < 100; ++i) { hold->putOnHold(0); } - for(int i = 0; i < 100; ++i) + for(i = 0; i < 100; ++i) { hold->ice_oneway()->putOnHold(0); } - for(int i = 0; i < 100; ++i) + for(i = 0; i < 100; ++i) { holdSerialized->putOnHold(0); } - for(int i = 0; i < 100; ++i) + for(i = 0; i < 100; ++i) { holdSerialized->ice_oneway()->putOnHold(0); } |