diff options
| author | Bernard Normier <bernard@zeroc.com> | 2007-10-02 17:55:17 -0400 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2007-10-02 17:55:17 -0400 |
| commit | b06a5f847ca9f421e2ed17976d53b001eae7b324 (patch) | |
| tree | 019389a1faff19e0fc3fb107707f08d2409f3915 /cpp | |
| parent | Squashed commit of the following: (diff) | |
| download | ice-b06a5f847ca9f421e2ed17976d53b001eae7b324.tar.bz2 ice-b06a5f847ca9f421e2ed17976d53b001eae7b324.tar.xz ice-b06a5f847ca9f421e2ed17976d53b001eae7b324.zip | |
Fixed Sun CC build
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 3 | ||||
| -rw-r--r-- | cpp/test/Freeze/dbmap/Client.cpp | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 3a76847cd9e..ef5a4b2f167 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -880,9 +880,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi StringSeq facetSeq = _initData.properties->getPropertyAsList("Ice.Admin.Facets"); - // - // TODO: port (ifdef) for old compilers! - // if(!facetSeq.empty()) { _adminFacetFilter.insert(facetSeq.begin(), facetSeq.end()); diff --git a/cpp/test/Freeze/dbmap/Client.cpp b/cpp/test/Freeze/dbmap/Client.cpp index 4d602cb39f4..3d5fd5fe3d7 100644 --- a/cpp/test/Freeze/dbmap/Client.cpp +++ b/cpp/test/Freeze/dbmap/Client.cpp @@ -877,7 +877,7 @@ main(int argc, char* argv[]) for (i = 0; i < 26; i++) { Ice::Byte key = static_cast<Ice::Byte>('a' + i); - map.insert(make_pair(key, i)); + map.insert(pair<const Byte, const int>(key, i)); } // Iterate over the map and change the values. |