Use return {}.

[libcxml.git] / src / cxml.h

diff --git a/src/cxml.h b/src/cxml.h
index 4d01eefdd8858a6985f25451455e210214d24c83..330cbb0aed9072f33d5927dfc0acbe021fa54598 100644 (file)
--- a/src/cxml.h
+++ b/src/cxml.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of libcxml.
 
@@ -21,14 +21,12 @@
 #ifndef LIBCXML_CXML_H
 #define LIBCXML_CXML_H
 
-#include <locked_sstream.h>
-#include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/erase.hpp>
 #include <stdint.h>
 #include <string>
-#include <list>
+#include <vector>
 
 /* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
 #ifdef check
@@ -66,6 +64,51 @@ private:
        std::string _message;
 };
 
+/** A sort-of version of boost::lexical_cast that does uses the "C"
+ *  locale (i.e. no thousands separators and a . for the decimal separator).
+ */
+template <typename P, typename Q>
+P
+raw_convert (Q)
+{
+       /* We can't write a generic version of raw_convert; all required
+          versions must be specialised.
+       */
+       BOOST_STATIC_ASSERT (sizeof(Q) == 0);
+}
+
+template <>
+int
+raw_convert (std::string v);
+
+template <>
+unsigned int
+raw_convert (std::string v);
+
+template <>
+long int
+raw_convert (std::string v);
+
+template <>
+long unsigned int
+raw_convert (std::string v);
+
+template <>
+long long
+raw_convert (std::string v);
+
+template <>
+long long unsigned
+raw_convert (std::string v);
+
+template <>
+float
+raw_convert (std::string v);
+
+template <>
+double
+raw_convert (std::string v);
+
 /** @brief A wrapper for a xmlpp::Node which simplifies parsing */
 class Node
 {
@@ -111,32 +154,22 @@ public:
        template <class T>
        T number_child (std::string c) const
        {
-               std::string s = string_child (c);
+               auto s = string_child (c);
                boost::erase_all (s, " ");
-               locked_stringstream t;
-               t.imbue (std::locale::classic ());
-               t << s;
-               T n;
-               t >> n;
-               return n;
+               return raw_convert<T> (s);
        }
 
        template <class T>
        boost::optional<T> optional_number_child (std::string c) const
        {
-               boost::optional<std::string> s = optional_string_child (c);
+               auto s = optional_string_child (c);
                if (!s) {
-                       return boost::optional<T> ();
+                       return {};
                }
 
-               std::string t = s.get ();
+               auto t = s.get ();
                boost::erase_all (t, " ");
-               locked_stringstream u;
-               u.imbue (std::locale::classic ());
-               u << t;
-               T n;
-               u >> n;
-               return n;
+               return raw_convert<T> (t);
        }
 
        /** This will mark a child as to be ignored when calling done() */
@@ -162,33 +195,23 @@ public:
        {
                std::string s = string_attribute (c);
                boost::erase_all (s, " ");
-               locked_stringstream t;
-               t.imbue (std::locale::classic ());
-               t << s;
-               T n;
-               t >> n;
-               return n;
+               return raw_convert<T> (s);
        }
 
        template <class T>
        boost::optional<T> optional_number_attribute (std::string c) const
        {
-               boost::optional<std::string> s = optional_string_attribute (c);
+               auto s = optional_string_attribute (c);
                if (!s) {
                        return boost::optional<T> ();
                }
 
-               std::string t = s.get ();
+               auto t = s.get ();
                boost::erase_all (t, " ");
-               locked_stringstream u;
-               u.imbue (std::locale::classic ());
-               u << t;
-               T n;
-               u >> n;
-               return n;
+               return raw_convert<T> (t);
        }
 
-       /** @return The text content of this node (including comments or CDATA) */
+       /** @return The text content of this node (excluding comments or CDATA) */
        std::string content () const;
 
        /** @return namespace URI of this node */
@@ -197,11 +220,11 @@ public:
        /** @return namespace prefix of this node */
        std::string namespace_prefix () const;
 
-       boost::shared_ptr<Node> node_child (std::string) const;
-       boost::shared_ptr<Node> optional_node_child (std::string) const;
+       std::shared_ptr<Node> node_child (std::string) const;
+       std::shared_ptr<Node> optional_node_child (std::string) const;
 
-       std::list<boost::shared_ptr<Node> > node_children () const;
-       std::list<boost::shared_ptr<Node> > node_children (std::string) const;
+       std::vector<std::shared_ptr<Node>> node_children () const;
+       std::vector<std::shared_ptr<Node>> node_children (std::string) const;
 
        xmlpp::Node* node () const {
                return _node;
@@ -211,11 +234,11 @@ protected:
        xmlpp::Node* _node;
 
 private:
-       mutable std::list<std::string> _taken;
+       mutable std::vector<std::string> _taken;
 };
 
-typedef boost::shared_ptr<cxml::Node> NodePtr;
-typedef boost::shared_ptr<const cxml::Node> ConstNodePtr;
+typedef std::shared_ptr<cxml::Node> NodePtr;
+typedef std::shared_ptr<const cxml::Node> ConstNodePtr;
 
 class Document : public Node
 {