win32: using boost::unordered_map

cbaselib/ClassNames.cpp

@@ -391,7 +391,11 @@ void ClassNames::getRGBColor ( int classno, int & r, int & g, int & b ) const
 void ClassNames::getClassnoFromColor ( int & classno, int r, int g, int b ) const
 {
   long color = 256 * ( 256 * r + g ) + b;
+#if defined WIN32 && defined NICE_USELIB_BOOST  
+  boost::unordered_map<long, int>::const_iterator i = tbl_color_classno.find ( color );
+#else
   __gnu_cxx::hash_map<long, int>::const_iterator i = tbl_color_classno.find ( color );
+#endif
 
   if ( i == tbl_color_classno.end() )
   {

cbaselib/ClassNames.h

@@ -17,7 +17,13 @@
 
 // in future we should replace this with 
 // unordered_map, but it is still experimental but standard c++
+#ifdef WIN32
+#ifdef NICE_USELIB_BOOST
+#include <boost/unordered_map.hpp>
+#endif
+#else
 #include <ext/hash_map>
+#endif
 
 #include "core/basics/Config.h"
 #include "core/basics/Persistent.h"
@@ -35,9 +41,15 @@ class ClassNames : public NICE::Persistent
     std::map<std::string, std::string> tbl_text_code;
     std::map<int, std::string> tbl_classno_code;
     std::map<std::string, int> tbl_code_classno;
-    __gnu_cxx::hash_map<long, int> tbl_color_classno;
+#if defined WIN32 && defined NICE_USELIB_BOOST
+    boost::unordered_map<long, int> tbl_color_classno;
+#else
+	__gnu_cxx::hash_map<long, int> tbl_color_classno;
+#endif
+
     std::map<int, long> tbl_classno_color;
 
+
     int maxClassNo;
 
   public: