[Orxonox-commit 646] r3178 - branches/pch/src/orxonox/objects/infos

[rgrieder at orxonox.net]

Author: rgrieder
Date: 2009-06-15 13:43:16 +0200 (Mon, 15 Jun 2009)
New Revision: 3178

Modified:
   branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
   branches/pch/src/orxonox/objects/infos/GametypeInfo.h
Log:
Build fix for Visual Studio 2005: Removed const qualifiers in GametypeInfo.
The problem is a compiler bug with template type deduction and const member functions.
I have made a post in the forum: https://forum.orxonox.net/viewtopic.php?f=6&t=352

Modified: branches/pch/src/orxonox/objects/infos/GametypeInfo.cc
===================================================================
--- branches/pch/src/orxonox/objects/infos/GametypeInfo.cc	2009-06-15 09:52:13 UTC (rev 3177)
+++ branches/pch/src/orxonox/objects/infos/GametypeInfo.cc	2009-06-15 11:43:16 UTC (rev 3178)
@@ -67,7 +67,7 @@
         registerVariable(this->hudtemplate_,            variableDirection::toclient);
     }
 
-    void GametypeInfo::sendAnnounceMessage(const std::string& message) const
+    void GametypeInfo::sendAnnounceMessage(const std::string& message)
     {
         if (GameMode::isMaster())
         {
@@ -76,7 +76,7 @@
         }
     }
 
-    void GametypeInfo::sendAnnounceMessage(const std::string& message, unsigned int clientID) const
+    void GametypeInfo::sendAnnounceMessage(const std::string& message, unsigned int clientID)
     {
         if (GameMode::isMaster())
         {
@@ -87,7 +87,7 @@
         }
     }
 
-    void GametypeInfo::sendKillMessage(const std::string& message, unsigned int clientID) const
+    void GametypeInfo::sendKillMessage(const std::string& message, unsigned int clientID)
     {
         if (GameMode::isMaster())
         {
@@ -98,7 +98,7 @@
         }
     }
 
-    void GametypeInfo::sendDeathMessage(const std::string& message, unsigned int clientID) const
+    void GametypeInfo::sendDeathMessage(const std::string& message, unsigned int clientID)
     {
         if (GameMode::isMaster())
         {
@@ -109,19 +109,19 @@
         }
     }
 
-    void GametypeInfo::dispatchAnnounceMessage(const std::string& message) const
+    void GametypeInfo::dispatchAnnounceMessage(const std::string& message)
     {
         for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
             it->announcemessage(this, message);
     }
 
-    void GametypeInfo::dispatchKillMessage(const std::string& message) const
+    void GametypeInfo::dispatchKillMessage(const std::string& message)
     {
         for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
             it->killmessage(this, message);
     }
 
-    void GametypeInfo::dispatchDeathMessage(const std::string& message) const
+    void GametypeInfo::dispatchDeathMessage(const std::string& message)
     {
         for (ObjectList<GametypeMessageListener>::iterator it = ObjectList<GametypeMessageListener>::begin(); it != ObjectList<GametypeMessageListener>::end(); ++it)
             it->deathmessage(this, message);

Modified: branches/pch/src/orxonox/objects/infos/GametypeInfo.h
===================================================================
--- branches/pch/src/orxonox/objects/infos/GametypeInfo.h	2009-06-15 09:52:13 UTC (rev 3177)
+++ branches/pch/src/orxonox/objects/infos/GametypeInfo.h	2009-06-15 11:43:16 UTC (rev 3178)
@@ -58,14 +58,14 @@
             inline const std::string& getHUDTemplate() const
                 { return this->hudtemplate_; }
 
-            void sendAnnounceMessage(const std::string& message) const;
-            void sendAnnounceMessage(const std::string& message, unsigned int clientID) const;
-            void sendKillMessage(const std::string& message, unsigned int clientID) const;
-            void sendDeathMessage(const std::string& message, unsigned int clientID) const;
+            void sendAnnounceMessage(const std::string& message);
+            void sendAnnounceMessage(const std::string& message, unsigned int clientID);
+            void sendKillMessage(const std::string& message, unsigned int clientID);
+            void sendDeathMessage(const std::string& message, unsigned int clientID);
 
-            void dispatchAnnounceMessage(const std::string& message) const;
-            void dispatchKillMessage(const std::string& message) const;
-            void dispatchDeathMessage(const std::string& message) const;
+            void dispatchAnnounceMessage(const std::string& message);
+            void dispatchKillMessage(const std::string& message);
+            void dispatchDeathMessage(const std::string& message);
 
         private:
             bool bStarted_;