Changeset 10293 for trunk

Timestamp:

04/07/11 08:42:04 (14 years ago)

Author:

tbretz

Message:

Fixed the conversion for cases like 'C:5'

File:

• trunk/FACT++/src/Converter.cc (modified) (4 diffs)

trunk/FACT++/src/Converter.cc

@@ -48 +48 @@
 strict argument in the constructor.
 
+@remark Note that all values are interpreted as signed, except the single
+char (e.g. C:5)
+
 */
 // **************************************************************************
@@ -528 +531 @@
             switch (i->first.first->name()[0])
             {
-            case 'c': // Skip whitespaces when checking for characters
-                if (j>0)
-                    line >> noskipws;
-                GetBinImp(data, Get<char>(line));
-                line >> skipws;
-                break;
             case 'b': GetBinImp(data, GetBool(line)); break;
             case 's': GetBinImp(data, Get<short>    (line)); break;
@@ -541 +538 @@
             case 'd': GetBinImp(data, Get<double>   (line)); break;
             case 'x': GetBinImp(data, Get<long long>(line)); break;
+            case 'c':
+                if (line.peek()==-1)
+                {
+                    line.clear(ios::failbit|ios::eofbit);
+                    break;
+                }
+                GetBinImp(data, Get<unsigned char>(line));
+                if (line.peek()==-1)
+                    line.clear(ios::eofbit);
+                break;
             case 'N':
                 GetBinString(data, GetString(line));
@@ -554 +561 @@
         }
 
-        //wout << "{" << line.eof() << line.good() << line.fail() << "}";
         if (!line)
             break;