mira-dev team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 185
committer: Alan Alvarez <aalvarez@xxxxxxxxxxxxx>
branch nick: trunk
timestamp: Fri 2009-10-30 17:46:18 -0500
message:
  Don't use std::hash_map for now. Will use std::unordered_map once it's standarized.
removed:
  mira-server/include/hash_map_string_compare.h
modified:
  mira-server/include/User.h
  mira-server/include/WorkPlace.h
  mira-server/include/directory/MD5.h
  mira-server/include/directory/plaintext/PlainTextDirectory.h
  mira-server/src/main.cpp


--
lp:mira
https://code.launchpad.net/~mira-dev/mira/trunk

Your team Mira Core Development Team is subscribed to branch lp:mira.
To unsubscribe from this branch go to https://code.launchpad.net/~mira-dev/mira/trunk/+edit-subscription.

=== modified file 'mira-server/include/User.h'
--- mira-server/include/User.h	2008-08-22 08:30:46 +0000
+++ mira-server/include/User.h	2009-10-30 22:46:18 +0000
@@ -23,20 +23,11 @@
 
 #include <string>
 #include <list>
+#include <map>
 
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/version.hpp>
-#include <boost/serialization/hash_map.hpp>
-
-#ifdef __GNUC__
-#include <ext/hash_map>
-#include "hash_map_string_compare.h"
-using __gnu_cxx::hash_map;
-#elif defined(_MSC_VER)
-#include <hash_map>
-using stdext::hash_map;
-#endif
 
 #include "Field.h"
 
@@ -47,7 +38,7 @@
 {
    public:
    	typedef std::list<unsigned int> WorkPlaceListType;
-        typedef hash_map< std::string, Field > FieldTableType;
+        typedef std::map< std::string, Field > FieldTableType;
 
         User() : m_id(0) {};
 

=== modified file 'mira-server/include/WorkPlace.h'
--- mira-server/include/WorkPlace.h	2008-08-22 08:30:46 +0000
+++ mira-server/include/WorkPlace.h	2009-10-30 22:46:18 +0000
@@ -23,11 +23,11 @@
 
 #include <string>
 #include <list>
+#include <map>
 
 #include <boost/serialization/nvp.hpp>
 #include <boost/serialization/access.hpp>
 #include <boost/serialization/version.hpp>
-#include <boost/serialization/hash_map.hpp>
 
 namespace miraserver
 {
@@ -36,7 +36,7 @@
 {
    public:
    	typedef std::list<unsigned int> UserListType;
-        typedef hash_map< std::string, Field > FieldTableType;
+        typedef std::map< std::string, Field > FieldTableType;
 
         WorkPlace() : m_id(0) {}
         WorkPlace(const std::string workplace_name, FieldTableType field_table = FieldTableType()) 

=== modified file 'mira-server/include/directory/MD5.h'
--- mira-server/include/directory/MD5.h	2008-03-11 03:36:26 +0000
+++ mira-server/include/directory/MD5.h	2009-10-30 22:46:18 +0000
@@ -62,6 +62,7 @@
 #define MD5_H
 
 #include <iostream>
+#include <inttypes.h>
  
 #define MD5_DIGEST_LENGTH 16
 

=== modified file 'mira-server/include/directory/plaintext/PlainTextDirectory.h'
--- mira-server/include/directory/plaintext/PlainTextDirectory.h	2008-08-24 19:59:32 +0000
+++ mira-server/include/directory/plaintext/PlainTextDirectory.h	2009-10-30 22:46:18 +0000
@@ -46,7 +46,7 @@
     public:
         PlainTextDirectory(const std::string &file_name) : Directory(), m_filename(file_name),
                                                            m_user_list(), m_workplace_list()
-        {  load();  }
+        {  load(); }
 
         virtual ~PlainTextDirectory()
         {

=== removed file 'mira-server/include/hash_map_string_compare.h'
--- mira-server/include/hash_map_string_compare.h	2008-08-22 07:57:11 +0000
+++ mira-server/include/hash_map_string_compare.h	1970-01-01 00:00:00 +0000
@@ -1,14 +0,0 @@
-#include <string>
-#include <ext/hash_map>
-
-namespace __gnu_cxx
-{
-        template<> struct hash< std::string >
-        {
-                size_t operator()( const std::string& x ) const
-                {
-                        return hash< const char* >()( x.c_str() );
-                }
-        };
-}
-

=== modified file 'mira-server/src/main.cpp'
--- mira-server/src/main.cpp	2008-08-24 19:59:32 +0000
+++ mira-server/src/main.cpp	2009-10-30 22:46:18 +0000
@@ -94,6 +94,7 @@
         clsk.set_field(field);
         Application::get_directory().update_user(clsk);
 */
+
     }
     catch (string error)
     {