diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2012-09-28 10:40:14 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2012-09-28 10:40:14 +0200 |
| commit | 8527be5894d0e0ba90db306b8ab124c04144ab44 (patch) | |
| tree | 5edbe2c2104764f9b3ba8721e573b32fe32f9baf /cpp/src/Ice/MetricsAdminI.cpp | |
| parent | minor fix to build IceGridGUI in OsX (diff) | |
| download | ice-8527be5894d0e0ba90db306b8ab124c04144ab44.tar.bz2 ice-8527be5894d0e0ba90db306b8ab124c04144ab44.tar.xz ice-8527be5894d0e0ba90db306b8ab124c04144ab44.zip | |
Java & C# port
Diffstat (limited to 'cpp/src/Ice/MetricsAdminI.cpp')
| -rw-r--r-- | cpp/src/Ice/MetricsAdminI.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp index cdf96b721c2..4664eca3425 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -67,10 +67,10 @@ validateProperties(const string& prefix, const PropertiesPtr& properties, const } } - if(!unknownProps.empty()) + if(!unknownProps.empty() && properties->getPropertyAsIntWithDefault("Ice.Warn.UnknownProperties", 1) > 0) { Warning out(getProcessLogger()); - out << "found unknown Ice metrics properties for '" << prefix.substr(0, prefix.size() - 1) << "':"; + out << "found unknown IceMX properties for '" << prefix.substr(0, prefix.size() - 1) << "':"; for(vector<string>::const_iterator p = unknownProps.begin(); p != unknownProps.end(); ++p) { out << "\n " << *p; @@ -120,7 +120,7 @@ MetricsMapI::RegExp::~RegExp() } bool -MetricsMapI::RegExp::match(const string& value, bool reject) +MetricsMapI::RegExp::match(const string& value) { #ifndef ICE_CPP11_REGEXP return regexec(&_preg, value.c_str(), 0, 0, 0) == 0; |