upd: Reimported logger library by Florian Weber from updated upstream

[cassiopeia.git] / src / io / record.h

diff --git a/src/io/record.h b/src/io/record.h
index 29c05ca04e7227745d64a8397ed700bfc39b71c6..0a1368117fc681099fe74b6cf8dca60a45da926d 100644 (file)
--- a/src/io/record.h
+++ b/src/io/record.h
@@ -57,13 +57,21 @@ public:
     }
 
     template <class T>
-    static void read( std::string::iterator& it, T& val ) {
-        char* data = ( char* ) &val;
+    static void read( std::string::const_iterator& it, T& val ) {
+        union typeConversion {
+            char buf[sizeof( T )];
+            T value;
+
+            typeConversion( const T& v ) : value( v ) {}
+        };
+
+        typeConversion data( 0 );
 
         for( size_t i = 0; i < sizeof( T ); i++ ) {
-            data[i] = *it;
-            it++;
+            data.buf[i] = *it++;
         }
+
+        val = data.value;
     }
 
     std::string packToString() {
@@ -79,12 +87,12 @@ public:
         return res;
     }
 
-    void unpackFromString( std::string str ) {
+    void unpackFromString( const std::string& str ) {
         if( str.size() != RECORD_HEADER_SIZE ) {
             throw "Invalid string length";
         }
 
-        auto it =  str.begin();
+        auto it =  str.cbegin();
         read( it, command );
         read( it, flags );
         read( it, sessid );