[libcvd-members] gvars3/gvars3 serialize.h

[Edward Rosten]

CVSROOT:        /cvsroot/libcvd
Module name:    gvars3
Changes by:     Edward Rosten <edrosten>        09/05/28 13:18:38

Modified files:
        gvars3         : serialize.h 

Log message:
        Fixes for deserialization.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gvars3/gvars3/serialize.h?cvsroot=libcvd&r1=1.14&r2=1.15

Patches:
Index: serialize.h
===================================================================
RCS file: /cvsroot/libcvd/gvars3/gvars3/serialize.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- serialize.h 27 May 2009 14:44:57 -0000      1.14
+++ serialize.h 28 May 2009 13:18:36 -0000      1.15
@@ -126,7 +126,7 @@
                                int c;
 
                                if((c = in.get()) == EOF)
-                                       return in;
+                                       return v;
 
                                if(c != '[')
                                {
@@ -251,7 +251,7 @@
                        return FromStream<T>::from(i);
                }
 
-               template<class T> int from_string(std::string& s, T& t)
+               template<class T> int from_string(const std::string& s, T& t)
                {
                        std::istringstream is(s);
                        t = from_stream<T>(is);