dasher r3692 - in trunk: . Src/DasherCore

[pwelche svn gnome org]

Author: pwelche
Date: Sun Apr 12 15:22:37 2009
New Revision: 3692
URL: http://svn.gnome.org/viewvc/dasher?rev=3692&view=rev

Log:
http://www.open-std.org/jtc1/sc22/wg21/docs/lwg-closed.html#140

The good news is that in my copy of "Working Draft, Standard for
Programming Language C++" of 2008-10-04, the "T is assignable" condition
is dropped, and in 23.1.4(5) has "Keys in an associative container
are immutable."


Modified:
   trunk/ChangeLog
   trunk/Src/DasherCore/ModuleManager.cpp
   trunk/Src/DasherCore/ModuleManager.h

Modified: trunk/Src/DasherCore/ModuleManager.cpp
==============================================================================
--- trunk/Src/DasherCore/ModuleManager.cpp	(original)
+++ trunk/Src/DasherCore/ModuleManager.cpp	Sun Apr 12 15:22:37 2009
@@ -33,7 +33,7 @@
     // This does
     //     m_mapNameToID[pModule->GetName()] = id;
     // but with error checking.
-    std::pair<std::map<const std::string, ModuleID_t>::iterator, bool> res;
+    std::pair<std::map<std::string, ModuleID_t>::iterator, bool> res;
     std::pair<const std::string, ModuleID_t> keyvalue(pModule->GetName(), id);
     res = m_mapNameToID.insert(keyvalue);
     if (!res.second)
@@ -60,7 +60,7 @@
     // This does
     //    return m_vModules[m_mapNameToID[strName]];
     // but with error checking.
-    std::map<const std::string, ModuleID_t>::iterator res;
+    std::map<std::string, ModuleID_t>::iterator res;
     res = m_mapNameToID.find(strName);
     if (res == m_mapNameToID.end()) {
         std::cerr << "Module \"" << strName << "\" not registered" <<std::endl;

Modified: trunk/Src/DasherCore/ModuleManager.h
==============================================================================
--- trunk/Src/DasherCore/ModuleManager.h	(original)
+++ trunk/Src/DasherCore/ModuleManager.h	Sun Apr 12 15:22:37 2009
@@ -48,7 +48,7 @@
 
  private:
   std::vector<CDasherModule *> m_vModules;
-  std::map<const std::string, ModuleID_t> m_mapNameToID;
+  std::map<std::string, ModuleID_t> m_mapNameToID;
   CDasherModule *m_pDefaultInputDevice;
   CDasherModule *m_pDefaultInputMethod;
 };