nemiver r942 - in trunk: . src/common

[dodji svn gnome org]

Author: dodji
Date: Sun Nov  2 14:16:12 2008
New Revision: 942
URL: http://svn.gnome.org/viewvc/nemiver?rev=942&view=rev

Log:
Fix a buglet where LOG() stopped working.

	* src/common/nmv-log-stream.cc: Store the allowed domain names in
	  instances of std::string instead of char*. This should help fix
	  a buglet where LOG() did stop working.

Modified:
   trunk/ChangeLog
   trunk/src/common/nmv-log-stream.cc

Modified: trunk/src/common/nmv-log-stream.cc
==============================================================================
--- trunk/src/common/nmv-log-stream.cc	(original)
+++ trunk/src/common/nmv-log-stream.cc	Sun Nov  2 14:16:12 2008
@@ -53,22 +53,10 @@
 
 using namespace std ;
 
-struct Eqstr
-{
-    bool operator() (const char* s1, const char* s2) const
-    {
-        return strcmp (s1, s2) == 0;
-    }
-};
-
 #if __GNUC__ >= 4 && __GNUC_MINOR__ >= 2
-struct DomainMap
-    : std::tr1::unordered_map<const char*, bool, std::tr1::hash<const char*>, Eqstr>
-{ };
+typedef std::tr1::unordered_map<std::string, bool> DomainMap;
 #else
-struct DomainMap
-    : __gnu_cxx::hash_map<const char*, bool, __gnu_cxx::hash<const char*>, Eqstr>
-{ };
+typedef __gnu_cxx::hash_map<std::string, bool> DomainMap;
 #endif
 
 static enum LogStream::StreamType s_stream_type = LogStream::COUT_STREAM ;