g++ 4.2 didn't like my last change.

git-svn-id: http://svn.voria.com/code@1517 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-core/trunk/src/synfig/guid.cpp b/synfig-core/trunk/src/synfig/guid.cpp
index d9c268b..9a5f2c2 100644 (file)
--- a/synfig-core/trunk/src/synfig/guid.cpp
+++ b/synfig-core/trunk/src/synfig/guid.cpp
@@ -158,7 +158,7 @@ synfig::GUID::hasher(const String& str)
         * accept Strings, so we're left with this conditional compilation.
         */
 # ifdef FUNCTIONAL_HASH_ON_STRING
-       HASH_MAP_NAMESPACE::hash<const String&> string_hash_;
+       HASH_MAP_NAMESPACE::hash<String> string_hash_;
        const unsigned int seed(string_hash_(str));
 # else  // FUNCTIONAL_HASH_ON_STRING
        HASH_MAP_NAMESPACE::hash<const char*> string_hash_;

diff --git a/synfig-studio/trunk/src/gtkmm/duck.h b/synfig-studio/trunk/src/gtkmm/duck.h
index 5ea5446..179fba7 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/duck.h
+++ b/synfig-studio/trunk/src/gtkmm/duck.h
@@ -53,7 +53,7 @@
 class StringHash
 {
 # ifdef FUNCTIONAL_HASH_ON_STRING
-       HASH_MAP_NAMESPACE::hash<const synfig::String&> hasher_;
+       HASH_MAP_NAMESPACE::hash<synfig::String> hasher_;
 # else  // FUNCTIONAL_HASH_ON_STRING
        HASH_MAP_NAMESPACE::hash<const char*> hasher_;
 # endif  // FUNCTIONAL_HASH_ON_STRING

diff --git a/synfig-studio/trunk/src/gtkmm/duckmatic.h b/synfig-studio/trunk/src/gtkmm/duckmatic.h
index fbbadae..a7340be 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/duckmatic.h
+++ b/synfig-studio/trunk/src/gtkmm/duckmatic.h
@@ -59,7 +59,7 @@
 class StringHash
 {
 # ifdef FUNCTIONAL_HASH_ON_STRING
-       HASH_MAP_NAMESPACE::hash<const synfig::String&> hasher_;
+       HASH_MAP_NAMESPACE::hash<synfig::String> hasher_;
 # else  // FUNCTIONAL_HASH_ON_STRING
        HASH_MAP_NAMESPACE::hash<const char*> hasher_;
 # endif  // FUNCTIONAL_HASH_ON_STRING