diff options
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/config/Make.rules.SunOS | 2 | ||||
| -rw-r--r-- | cpp/demo/Freeze/library/LibraryI.cpp | 14 |
2 files changed, 2 insertions, 14 deletions
diff --git a/cpp/config/Make.rules.SunOS b/cpp/config/Make.rules.SunOS index aeb93ccbd61..8fb40abe276 100644 --- a/cpp/config/Make.rules.SunOS +++ b/cpp/config/Make.rules.SunOS @@ -17,7 +17,7 @@ # comment it out and define CXX=<desired-compiler> in your environment. # If CXX is not defined anywhere, the default (from gmake) is g++. # -CXX ?= CC +CXX = CC # This variable is used to determine the machine type. # For SUN UltraSPARC machines: sun4u diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp index 8a950d3b95c..5ae10812f9c 100644 --- a/cpp/demo/Freeze/library/LibraryI.cpp +++ b/cpp/demo/Freeze/library/LibraryI.cpp @@ -107,9 +107,7 @@ BookI::returnBook(const Ice::Current&) rentalCustomerName.clear();; } -// Needs to be extern for the Sun C++ 5.4 compiler -// -extern Ice::Identity +Ice::Identity createBookIdentity(const string& isbn) { // @@ -157,17 +155,7 @@ LibraryI::createBook(const Demo::BookDescription& description, const Ice::Curren { IceUtil::Mutex::Lock lock(*this); -#if defined(__SUNPRO_CC) - // - // Strange CC bug (only when optimizing and raising BookExistsException) - // - BookPrx book; - { - book = IsbnToBook(c.adapter)(description.isbn); - } -#else BookPrx book = IsbnToBook(c.adapter)(description.isbn); -#endif try { book->ice_ping(); |