diff options
Diffstat (limited to 'cpp/src')
| -rwxr-xr-x | cpp/src/Glacier2/FilterManager.cpp | 28 | ||||
| -rw-r--r-- | cpp/src/Ice/Instance.cpp | 7 |
2 files changed, 3 insertions, 32 deletions
diff --git a/cpp/src/Glacier2/FilterManager.cpp b/cpp/src/Glacier2/FilterManager.cpp index 99bc204ed9e..f2dece5f253 100755 --- a/cpp/src/Glacier2/FilterManager.cpp +++ b/cpp/src/Glacier2/FilterManager.cpp @@ -232,45 +232,17 @@ Glacier2::FilterManager::create(const CommunicatorPtr& communicator, const Objec const bool allowAddUser) { PropertiesPtr props = communicator->getProperties(); - // - // DEPRECATED PROPERTY: Glacier2.AllowCategories is to be deprecated - // and superseded by Glacier2.Filter.Category.Accept. - // string allow = props->getProperty("Glacier2.Filter.Category.Accept"); - if(allow.empty()) - { - allow = props->getProperty("Glacier2.AllowCategories"); - if(!allow.empty()) - { - communicator->getLogger()->warning( - "Glacier2.AllowCategories has been deprecated, use Glacier2.Filter.Category.Accept instead."); - } - } - vector<string> allowSeq; stringToSeq(allow, allowSeq); if(allowAddUser) { - // - // DEPRECATED PROPERTY: Glacier2.AddUserToAllowCategories is to be deprecated - // and superseded by Glacier2.Filter.Category.AcceptUser. - // int addUserMode; if(!props->getProperty("Glacier2.Filter.Category.AcceptUser").empty()) { addUserMode = props->getPropertyAsInt("Glacier2.Filter.Category.AcceptUser"); } - else - { - if(!props->getProperty("Glacier2.AddUserToAllowCategories").empty()) - { - communicator->getLogger()->warning( - "Glacier2.AddUserToAllowCategories has been deprecated, \ - use Glacier2.Filter.Category.AcceptUser instead."); - } - addUserMode = props->getPropertyAsInt("Glacier2.AddUserToAllowCategories"); - } if(addUserMode > 0 && !userId.empty()) { diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp index 7fd7ef6c555..c450d48046c 100644 --- a/cpp/src/Ice/Instance.cpp +++ b/cpp/src/Ice/Instance.cpp @@ -580,13 +580,12 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi if(!_initData.logger) { #ifdef _WIN32 + // + // DEPRECATED PROPERTY: Ice.UseEventLog is deprecated. + // if(_initData.properties->getPropertyAsInt("Ice.UseEventLog") > 0) { _initData.logger = new EventLoggerI(_initData.properties->getProperty("Ice.ProgramName")); - // - // DEPRECATED PROPERTY: Ice.UseEventLog is deprecated. - // - _initData.logger->warning("Ice.UseEventLog is deprecated."); } #else if(_initData.properties->getPropertyAsInt("Ice.UseSyslog") > 0) |