[GEM-cvs] SF.net SVN: pd-gem:[3891] trunk/Gem/src/Base/GemState.cpp

[<zmo...@us...>]

Revision: 3891
          http://pd-gem.svn.sourceforge.net/pd-gem/?rev=3891&view=rev
Author:   zmoelnig
Date:     2011-03-22 08:07:08 +0000 (Tue, 22 Mar 2011)

Log Message:
-----------
use GemState::key_t rather than key_t

should fix compilation issues on osx/10.5

Modified Paths:
--------------
    trunk/Gem/src/Base/GemState.cpp

Modified: trunk/Gem/src/Base/GemState.cpp
===================================================================
--- trunk/Gem/src/Base/GemState.cpp	2011-03-21 21:24:54 UTC (rev 3890)
+++ trunk/Gem/src/Base/GemState.cpp	2011-03-22 08:07:08 UTC (rev 3891)
@@ -58,7 +58,7 @@
 
  protected:
   // dictionary for setting values
-  std::map <key_t, any> data;
+  std::map <GemState::key_t, any> data;
 
   std::auto_ptr<GLStack>stacks;
 };
@@ -187,8 +187,8 @@
 
 
 /* get a named property */
-bool GemState::get(const key_t key, any&value) {
-  std::map<int,any>::iterator it = 
+bool GemState::get(const GemState::key_t key, any&value) {
+  std::map<GemState::key_t,any>::iterator it = 
     data->data.find(key);
   if(it==data->data.end()) {
     if(key==_PIX) { value=image; return true; }
@@ -231,7 +231,7 @@
 }
 
 /* set a named property */
-bool GemState::set(const key_t key, any value) {
+bool GemState::set(const GemState::key_t key, any value) {
   if(value.empty()) {
     data->data.erase(key);
     return false;
@@ -261,7 +261,7 @@
 }
 
 /* remove a named property */
-bool GemState::remove(const key_t key) {
+bool GemState::remove(const GemState::key_t key) {
   return (0!=data->data.erase(key));
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.