diff options
| author | Jose <jose@zeroc.com> | 2012-10-24 18:06:41 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2012-10-24 18:06:41 +0200 |
| commit | a0a1d2a05ea2fbf27f57f2852eb8142031a62222 (patch) | |
| tree | 3a5cf9ec9e4a136e8a3ba43fe3ffce6bc2d7e824 /cpp/src/Ice/MetricsAdminI.cpp | |
| parent | x64 fix for Python (diff) | |
| download | ice-a0a1d2a05ea2fbf27f57f2852eb8142031a62222.tar.bz2 ice-a0a1d2a05ea2fbf27f57f2852eb8142031a62222.tar.xz ice-a0a1d2a05ea2fbf27f57f2852eb8142031a62222.zip | |
Fixed regex ifdef/ndef code.
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 bf448237de4..60b946bd056 100644 --- a/cpp/src/Ice/MetricsAdminI.cpp +++ b/cpp/src/Ice/MetricsAdminI.cpp @@ -99,7 +99,7 @@ MetricsMapI::RegExp::RegExp(const string& attribute, const string& regexp) : _at // No regexp support with MinGW, when MinGW C++11 mode is not experimental // we can use std::regex. // -#elif defined(ICE_CPP11_REGEXP) +#elif !defined(ICE_CPP11_REGEXP) if(regcomp(&_preg, regexp.c_str(), REG_EXTENDED | REG_NOSUB) != 0) { throw SyscallException(__FILE__, __LINE__); @@ -120,7 +120,7 @@ MetricsMapI::RegExp::~RegExp() // No regexp support with MinGW, when MinGW C++11 mode is not experimental // we can use std::regex. // -#elif defined(ICE_CPP11_REGEXP) +#elif !defined(ICE_CPP11_REGEXP) regfree(&_preg); #endif } @@ -134,7 +134,7 @@ MetricsMapI::RegExp::match(const string& value) // we can use std::regex. // return false; -#elif defined(ICE_CPP11_REGEXP) +#elif !defined(ICE_CPP11_REGEXP) return regexec(&_preg, value.c_str(), 0, 0, 0) == 0; #else # if _MSC_VER < 1600 |