diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2007-08-28 08:06:43 -0400 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2007-08-28 08:06:43 -0400 |
| commit | a829e12ba76219025372be7fc1b2fc8b1845151b (patch) | |
| tree | cea9fc7e73a7e3da27c3049c80994d0a45e84252 /cpp | |
| parent | Merge branch 'master' of ssh://cvs.zeroc.com/home/git/ice (diff) | |
| download | ice-a829e12ba76219025372be7fc1b2fc8b1845151b.tar.bz2 ice-a829e12ba76219025372be7fc1b2fc8b1845151b.tar.xz ice-a829e12ba76219025372be7fc1b2fc8b1845151b.zip | |
Fixed compilation on hp
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/demo/Freeze/casino/BankI.h | 2 | ||||
| -rw-r--r-- | cpp/demo/Freeze/casino/BetResolver.h | 2 | ||||
| -rw-r--r-- | cpp/demo/Freeze/casino/Server.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cpp/demo/Freeze/casino/BankI.h b/cpp/demo/Freeze/casino/BankI.h index 3c2d76ddb43..bd21406023b 100644 --- a/cpp/demo/Freeze/casino/BankI.h +++ b/cpp/demo/Freeze/casino/BankI.h @@ -55,7 +55,7 @@ private: std::vector<CasinoStore::PersistentBetPrx> getBets(const Ice::ObjectAdapterPtr&) const; -#if defined(_MSC_VER) && (_MSC_VER < 1300) +#if defined(__hpux) || (defined(_MSC_VER) && (_MSC_VER < 1300)) // // Some compilers don't let local classes access private data members // diff --git a/cpp/demo/Freeze/casino/BetResolver.h b/cpp/demo/Freeze/casino/BetResolver.h index 8e08142db90..dfbe0a63315 100644 --- a/cpp/demo/Freeze/casino/BetResolver.h +++ b/cpp/demo/Freeze/casino/BetResolver.h @@ -30,7 +30,7 @@ public: int getBetCount() const; -#if !defined(_MSC_VER) || (_MSC_VER >= 1300) +#if !defined(__hpux) && (!defined(_MSC_VER) || (_MSC_VER >= 1300)) // // Some compilers don't let local classes access private members // diff --git a/cpp/demo/Freeze/casino/Server.cpp b/cpp/demo/Freeze/casino/Server.cpp index d5b49d2d518..e033b766164 100644 --- a/cpp/demo/Freeze/casino/Server.cpp +++ b/cpp/demo/Freeze/casino/Server.cpp @@ -30,7 +30,7 @@ private: map<string, string> createTypeMap(const string&); const string _envName; -#if defined(_MSC_VER) && (_MSC_VER < 1300) +#if defined(__hpux) || (defined(_MSC_VER) && (_MSC_VER < 1300)) // // Some compilers don't let local classes access private data members // |