diff options
| author | Bernard Normier <bernard@zeroc.com> | 2012-11-26 13:14:25 -0500 |
|---|---|---|
| committer | Bernard Normier <bernard@zeroc.com> | 2012-11-26 13:14:25 -0500 |
| commit | 7eefa441f4296e597fb3db05ee201cbfd9021260 (patch) | |
| tree | 91bf6d33c04c891cfee15421554de4c4eb33ec9f /cpp/src/Ice/MetricsAdminI.cpp | |
| parent | ICE-4794 - add overloads for optional Java mapping (diff) | |
| download | ice-7eefa441f4296e597fb3db05ee201cbfd9021260.tar.bz2 ice-7eefa441f4296e597fb3db05ee201cbfd9021260.tar.xz ice-7eefa441f4296e597fb3db05ee201cbfd9021260.zip | |
Fixed build failure on Solaris CC
Diffstat (limited to 'cpp/src/Ice/MetricsAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.cpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index 646d218b58f..6da5d47437e 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -514,7 +514,17 @@ MetricsAdminI::getMetricsViewNames(Ice::StringSeq& disabledViews, const Current& { enabledViews.push_back(p->first); } + +#if defined(__SUNPRO_CC) && defined(_RWSTD_NO_MEMBER_TEMPLATES) + for(set<string>::const_iterator p = _disabledViews.begin(); p != _disabledViews.end(); ++p) + { + disabledViews.push_back(*p); + } + +#else disabledViews.insert(disabledViews.end(), _disabledViews.begin(), _disabledViews.end()); +#endif + return enabledViews; } |