X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fduckmatic.h;h=b8d8247b8ef6f27dfcb0bb21ebc464345c140971;hb=392b62fa87099d8576a9da614be431a5046fe595;hp=134fc5d60507ed2ff5e1d06733b76c7039868e70;hpb=aa759125fb923ee26c866453aada53db7e053e6a;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.h b/synfig-studio/trunk/src/gtkmm/duckmatic.h index 134fc5d..b8d8247 100644 --- a/synfig-studio/trunk/src/gtkmm/duckmatic.h +++ b/synfig-studio/trunk/src/gtkmm/duckmatic.h @@ -50,15 +50,13 @@ /* === M A C R O S ========================================================= */ -#define HASH_MAP_H - #ifdef HASH_MAP_H #include HASH_MAP_H #ifndef __STRING_HASH__ #define __STRING_HASH__ class StringHash { - __gnu_cxx::hash hasher_; + HASH_MAP_NAMESPACE::hash hasher_; public: size_t operator()(const synfig::String& x)const { @@ -124,7 +122,7 @@ class Duckmatic public: #ifdef HASH_MAP_H -typedef __gnu_cxx::hash_map,synfig::GUIDHash> DuckDataMap; +typedef HASH_MAP_CLASS,synfig::GUIDHash> DuckDataMap; #else typedef std::map > DuckDataMap; #endif @@ -434,7 +432,7 @@ public: bool is_valid()const { return (bool)stroke_data; } sigc::signal &signal_user_click(int i=0) { assert(i>=0); assert(i<5); return signal_user_click_[i]; } -}; // END of struct Duckmatic::Bezier +}; // END of struct Duckmatic::Stroke }; // END of namespace studio