diff options
author | Brent Eagles <brent@zeroc.com> | 2007-11-02 15:46:53 -0230 |
---|---|---|
committer | Brent Eagles <brent@zeroc.com> | 2007-11-02 15:46:53 -0230 |
commit | 34638082ee7fb3f7ad7b3333b14f83fb8aee6158 (patch) | |
tree | fc63e4c660e641149c2eca51f518c293c513c4f8 /cpp | |
parent | Fixed bug #2528 (diff) | |
download | ice-34638082ee7fb3f7ad7b3333b14f83fb8aee6158.tar.bz2 ice-34638082ee7fb3f7ad7b3333b14f83fb8aee6158.tar.xz ice-34638082ee7fb3f7ad7b3333b14f83fb8aee6158.zip |
Fix VC60 compilation problems
Diffstat (limited to 'cpp')
-rwxr-xr-x | cpp/src/iceserviceinstall/Install.cpp | 6 | ||||
-rwxr-xr-x | cpp/src/iceserviceinstall/ServiceInstaller.h | 9 |
2 files changed, 12 insertions, 3 deletions
diff --git a/cpp/src/iceserviceinstall/Install.cpp b/cpp/src/iceserviceinstall/Install.cpp index eae30bde49b..336e4a3b820 100755 --- a/cpp/src/iceserviceinstall/Install.cpp +++ b/cpp/src/iceserviceinstall/Install.cpp @@ -94,11 +94,11 @@ Install::run(int argc, char* argv[]) } int serviceType = -1; - for(int i = 0; i < IceServiceInstaller::serviceCount; ++i) + for(int j = 0; j < IceServiceInstaller::serviceCount; ++j) { - if(commands[0] == IceServiceInstaller::serviceTypeToLowerString(i)) + if(commands[0] == IceServiceInstaller::serviceTypeToLowerString(j)) { - serviceType = i; + serviceType = j; break; // for } } diff --git a/cpp/src/iceserviceinstall/ServiceInstaller.h b/cpp/src/iceserviceinstall/ServiceInstaller.h index afe18a589d1..88c3edea2d7 100755 --- a/cpp/src/iceserviceinstall/ServiceInstaller.h +++ b/cpp/src/iceserviceinstall/ServiceInstaller.h @@ -24,10 +24,19 @@ class ICE_SERVICE_INSTALLER_API IceServiceInstaller { public: +#if defined(_MSC_VER) && _MSC_VER < 1300 + enum { + icegridregistry = 0, + icegridnode = 1, + glacier2router = 2, + serviceCount = 3 + }; +#else static const int icegridregistry = 0; static const int icegridnode = 1; static const int glacier2router = 2; static const int serviceCount = 3; +#endif IceServiceInstaller(int, const std::string&, const Ice::CommunicatorPtr&); ~IceServiceInstaller(); |