verify that whitespace is eaten.

2 files changed, 16 insertions, 5 deletions

diff --git a/vespalib/src/tests/stllike/asciistream_test.cpp b/vespalib/src/tests/stllike/asciistream_test.cpp
index 6e628d7e52c..fd362d9c49a 100644
--- a/vespalib/src/tests/stllike/asciistream_test.cpp
+++ b/vespalib/src/tests/stllike/asciistream_test.cpp
@@ -40,10 +40,21 @@ AsciistreamTest::verifyBothWays(T value, const char * expected)
     os << value;
     EXPECT_EQUAL(os.str(), string(expected));
     EXPECT_EQUAL(os.size(), strlen(expected));
-    T v;
-    os >> v;
-    EXPECT_EQUAL(value, v);
-    EXPECT_TRUE(os.empty());
+    {
+        T v;
+        os >> v;
+        EXPECT_EQUAL(value, v);
+        EXPECT_TRUE(os.empty());
+    }
+
+    {
+        os << "   " << expected;
+        T v;
+        os >> v;
+        EXPECT_EQUAL(value, v);
+        EXPECT_TRUE(os.empty());
+        EXPECT_EQUAL(0u, os.size());
+    }
 }
 
 template <typename T>
diff --git a/vespalib/src/vespa/vespalib/stllike/asciistream.cpp b/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
index 739eb2f6d78..8114923a9fc 100644
--- a/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
+++ b/vespalib/src/vespa/vespalib/stllike/asciistream.cpp
@@ -221,7 +221,7 @@ T strToInt(T & v, const char *begin, const char *end)
         throwInputError(err.ec, "strToInt", begin);
     }
 
-    return err.ptr - curr;
+    return err.ptr - begin;
 }
 
 }