Changeset 17264 for trunk/Mars/mcore/checksum.h

Timestamp:

10/18/13 17:52:38 (11 years ago)

Author:

tbretz

Message:

Hopefully finished removing the std namespace from the headers.

File:

• trunk/Mars/mcore/checksum.h (modified) (5 diffs)

trunk/Mars/mcore/checksum.h

@@ -7 +7 @@
 
 #include <stdint.h>
-
-namespace std
-{
 
 class Checksum
@@ -43 +40 @@
         return *this;
     }
+
     Checksum operator+(Checksum sum) const
     {
@@ -60 +58 @@
         if (len%4>0)
         {
-            ostringstream sout;
-            sout << "Length " << len << " not dividable by 4." << endl;
+            std::ostringstream sout;
+            sout << "Length " << len << " not dividable by 4";
 
 #ifdef __EXCEPTIONS
-            throw runtime_error(sout.str());
+            throw std::runtime_error(sout.str());
 #else
             gLog << ___err___ << "ERROR - " << sout.str() << endl;
@@ -143 +141 @@
     }
 
-    bool add(const vector<char> &v, bool big_endian = true)
+    bool add(const std::vector<char> &v, bool big_endian = true)
     {
         return add(v.data(), v.size(), big_endian);
     }
 
-    string str(bool complm=true) const
-    {
-        string rc(16,0);
+    std::string str(bool complm=true) const
+    {
+        std::string rc(16,0);
 
         const uint8_t exclude[13] =
@@ -241 +239 @@
    }
 };
-}
 
 #endif