summaryrefslogtreecommitdiff
path: root/cpp/demo/Freeze/library/LibraryI.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/demo/Freeze/library/LibraryI.cpp')
-rw-r--r--cpp/demo/Freeze/library/LibraryI.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/demo/Freeze/library/LibraryI.cpp b/cpp/demo/Freeze/library/LibraryI.cpp
index 4e8eacb9d6e..4e96479e7d7 100644
--- a/cpp/demo/Freeze/library/LibraryI.cpp
+++ b/cpp/demo/Freeze/library/LibraryI.cpp
@@ -121,7 +121,9 @@ BookI::returnBook(const Ice::Current&)
rentalCustomerName.clear();;
}
-static Ice::Identity
+// Needs to be extern for the Sun C++ 5.4 compiler
+//
+extern Ice::Identity
createBookIdentity(const string& isbn)
{
//
@@ -213,7 +215,7 @@ LibraryI::createBook(const ::BookDescription& description, const Ice::Current&)
}
isbnSeq.push_back(description.isbn);
- _authors.insert(make_pair(description.authors, isbnSeq));
+ _authors.insert(StringIsbnSeqDict::value_type(description.authors, isbnSeq));
return book;
}
@@ -320,7 +322,7 @@ LibraryI::remove(const BookDescription& description)
//
// Otherwise, write back the new record.
//
- _authors.insert(make_pair(description.authors, isbnSeq));
+ _authors.insert(StringIsbnSeqDict::value_type(description.authors, isbnSeq));
}
//