objecthandler-cvs

[Ferdinando A. <na...@us...>]

Update of /cvsroot/objecthandler/ObjectHandler/oh
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv19201/oh

Modified Files:
	objecthandler.cpp 
Log Message:
uppercase not used anymore: use boost::algorithm::to_upper_copy instead

Index: objecthandler.cpp
===================================================================
RCS file: /cvsroot/objecthandler/ObjectHandler/oh/objecthandler.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** objecthandler.cpp	29 Oct 2006 16:13:43 -0000	1.6
--- objecthandler.cpp	2 Jan 2007 11:15:26 -0000	1.7
***************
*** 26,29 ****
--- 26,30 ----
  #include <ostream>
  #include <sstream>
+ #include <boost/algorithm/string/case_conv.hpp>
  #include <boost/regex.hpp>
  #include <algorithm>
***************
*** 65,69 ****
              const std::string &objectID, 
              const boost::shared_ptr<Object> &object) {
!         convertCase_[uppercase(objectID)] = objectID;
          repository_[objectID] = object;
          return objectID;
--- 66,70 ----
              const std::string &objectID, 
              const boost::shared_ptr<Object> &object) {
!                 convertCase_[boost::algorithm::to_upper_copy(objectID)] = objectID;
          repository_[objectID] = object;
          return objectID;
***************
*** 73,77 ****
              const std::string &objectID) const {
          std::map<std::string, std::string>::const_iterator result
!             = convertCase_.find(uppercase(objectID));
          if (result == convertCase_.end()) {
              std::ostringstream msg;
--- 74,78 ----
              const std::string &objectID) const {
          std::map<std::string, std::string>::const_iterator result
!             = convertCase_.find(boost::algorithm::to_upper_copy(objectID));
          if (result == convertCase_.end()) {
              std::ostringstream msg;
***************
*** 84,89 ****
  
      void ObjectHandler::deleteObject(const std::string &objectID) {
!         repository_.erase(convertCase_[uppercase(objectID)]);
!         convertCase_.erase(uppercase(objectID));
      }
  
--- 85,90 ----
  
      void ObjectHandler::deleteObject(const std::string &objectID) {
!         repository_.erase(convertCase_[boost::algorithm::to_upper_copy(objectID)]);
!         convertCase_.erase(boost::algorithm::to_upper_copy(objectID));
      }
  
***************
*** 102,106 ****
                  if (!object->permanent()) {
                      repository_.erase(key);
!                     convertCase_.erase(uppercase(key));
                  }
              }
--- 103,107 ----
                  if (!object->permanent()) {
                      repository_.erase(key);
!                     convertCase_.erase(boost::algorithm::to_upper_copy(key));
                  }
              }
***************
*** 140,144 ****
      void ObjectHandler::checkName(const std::string &objectID) {
          std::map<std::string, std::string>::const_iterator result =
!             convertCase_.find(uppercase(objectID));
          if (result != convertCase_.end()) {
              std::ostringstream msg;
--- 141,145 ----
      void ObjectHandler::checkName(const std::string &objectID) {
          std::map<std::string, std::string>::const_iterator result =
!             convertCase_.find(boost::algorithm::to_upper_copy(objectID));
          if (result != convertCase_.end()) {
              std::ostringstream msg;