summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/PropertiesAdminI.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2015-07-08 13:33:41 -0230
committerDwayne Boone <dwayne@zeroc.com>2015-07-08 13:33:41 -0230
commitec106aa0f053b6ea6563b0430b2298c869e0a776 (patch)
tree215069baaba9c79c366a7a4b6295b00c307c5957 /cpp/src/Ice/PropertiesAdminI.cpp
parentFixed download link for Windows third party installer (diff)
downloadice-ec106aa0f053b6ea6563b0430b2298c869e0a776.tar.bz2
ice-ec106aa0f053b6ea6563b0430b2298c869e0a776.tar.xz
ice-ec106aa0f053b6ea6563b0430b2298c869e0a776.zip
ICE-6514 Removed uneeded includes of DisableWarnings.h
Diffstat (limited to 'cpp/src/Ice/PropertiesAdminI.cpp')
-rw-r--r--cpp/src/Ice/PropertiesAdminI.cpp13
1 files changed, 6 insertions, 7 deletions
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index a471989e1aa..58095fbf0dc 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -7,7 +7,6 @@
//
// **********************************************************************
-#include <IceUtil/DisableWarnings.h>
#include <Ice/PropertiesAdminI.h>
#include <Ice/Logger.h>
#include <Ice/LoggerUtil.h>
@@ -15,7 +14,7 @@
using namespace std;
using namespace Ice;
-namespace
+namespace
{
const char* traceCategory = "Admin.Properties";
@@ -49,11 +48,11 @@ PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr
const Current&)
{
Lock sync(*this);
-
+
PropertyDict old = _properties->getPropertiesForPrefix("");
PropertyDict::const_iterator p;
const int traceLevel = _properties->getPropertyAsInt("Ice.Trace.Admin.Properties");
-
+
//
// Compute the difference between the new property set and the existing property set:
//
@@ -99,13 +98,13 @@ PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr
}
}
}
-
+
if(traceLevel > 0 && (!added.empty() || !changed.empty() || !removed.empty()))
{
Trace out(_logger, traceCategory);
-
+
out << "Summary of property changes";
-
+
if(!added.empty())
{
out << "\nNew properties:";