/*
- Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2021 Carl Hetherington <cth@carlh.net>
This file is part of libcxml.
#ifndef LIBCXML_CXML_H
#define LIBCXML_CXML_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
*/
template <typename P, typename Q>
P
-raw_convert (Q v)
+raw_convert (Q)
{
/* We can't write a generic version of raw_convert; all required
versions must be specialised.
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 <class T>
T number_child (std::string c) const
{
- std::string s = string_child (c);
+ auto s = string_child (c);
boost::erase_all (s, " ");
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, " ");
return raw_convert<T> (t);
}
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, " ");
return raw_convert<T> (t);
}
/** @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;
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
{