Remove use of boost::lexical_cast as it appears to be difficult to

make it use the standard "C" locale for both decimal and thousands
separators.  Instead, use std::stringstream which it appears will
use "C" for both decimal and thousands after s.imbue
(std::locale::classic ());

diff --git a/src/cxml.cc b/src/cxml.cc
index a955b916c5a8af47f1fedbef8b8445bea2e02f24..68ad109a0762a2f73cb90175e76395eba236bd50 100644 (file)
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <sstream>
 #include <iostream>
 #include <boost/lexical_cast.hpp>

diff --git a/src/cxml.h b/src/cxml.h
index df9905614ba23f03dec13debe3374429353f7082..eea15f5eb3f3cf4872c6e6d507c9fe048109195a 100644 (file)
--- a/src/cxml.h
+++ b/src/cxml.h
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef LIBCXML_CXML_H
 #define LIBCXML_CXML_H
 
@@ -6,7 +25,6 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
-#include <boost/lexical_cast.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/erase.hpp>
 #include <glibmm.h>
@@ -89,7 +107,12 @@ public:
        {
                std::string s = string_child (c);
                boost::erase_all (s, " ");
-               return boost::lexical_cast<T> (s);
+               std::stringstream t;
+               t.imbue (std::locale::classic ());
+               t << s;
+               T n;
+               t >> n;
+               return n;
        }
 
        template <class T>
@@ -102,7 +125,12 @@ public:
 
                std::string t = s.get ();
                boost::erase_all (t, " ");
-               return boost::optional<T> (boost::lexical_cast<T> (t));
+               std::stringstream u;
+               u.imbue (std::locale::classic ());
+               u << t;
+               T n;
+               u >> n;
+               return n;
        }
                
        /** This will mark a child as to be ignored when calling done() */
@@ -128,7 +156,12 @@ public:
        {
                std::string s = string_attribute (c);
                boost::erase_all (s, " ");
-               return boost::lexical_cast<T> (s);
+               std::stringstream t;
+               t.imbue (std::locale::classic ());
+               t << s;
+               T n;
+               t >> n;
+               return n;
        }
 
        template <class T>
@@ -141,7 +174,12 @@ public:
 
                std::string t = s.get ();
                boost::erase_all (t, " ");
-               return boost::optional<T> (boost::lexical_cast<T> (t));
+               std::stringstream u;
+               u.imbue (std::locale::classic ());
+               u << t;
+               T n;
+               t >> n;
+               return n;
        }
 
        /** @return The content of this node */