summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2021-01-08 14:09:08 +0100
committerCarl Hetherington <cth@carlh.net>2021-01-08 14:13:41 +0100
commitdbcf32baf0af10eeaac33460dd617bf1de3075ca (patch)
tree90fb707cc1960f9c36cf9b0c47d2d35a3072fe6c /src
parent3540b3350c6a172b2162c32430248cad2d236898 (diff)
Use std::vector instead of std::list.
Diffstat (limited to 'src')
-rw-r--r--src/cxml.cc12
-rw-r--r--src/cxml.h8
2 files changed, 10 insertions, 10 deletions
diff --git a/src/cxml.cc b/src/cxml.cc
index 356e1df..c21bd19 100644
--- a/src/cxml.cc
+++ b/src/cxml.cc
@@ -24,9 +24,9 @@
#include <boost/algorithm/string.hpp>
#include <cstdio>
-using std::string;
-using std::list;
using std::shared_ptr;
+using std::string;
+using std::vector;
using boost::optional;
cxml::Node::Node ()
@@ -76,14 +76,14 @@ cxml::Node::optional_node_child (string name) const
return n.front ();
}
-list<shared_ptr<cxml::Node>>
+vector<shared_ptr<cxml::Node>>
cxml::Node::node_children () const
{
if (!_node) {
throw Error ("No node to read children from");
}
- list<shared_ptr<cxml::Node> > n;
+ vector<shared_ptr<cxml::Node> > n;
for (auto i: _node->get_children()) {
n.push_back (shared_ptr<Node> (new Node (i)));
}
@@ -91,14 +91,14 @@ cxml::Node::node_children () const
return n;
}
-list<shared_ptr<cxml::Node>>
+vector<shared_ptr<cxml::Node>>
cxml::Node::node_children (string name) const
{
/* XXX: using find / get_path should work here, but I can't follow
how get_path works.
*/
- list<shared_ptr<cxml::Node> > n;
+ vector<shared_ptr<cxml::Node> > n;
for (auto i: _node->get_children()) {
if (i->get_name() == name) {
n.push_back (shared_ptr<Node> (new Node (i)));
diff --git a/src/cxml.h b/src/cxml.h
index 2bdde74..4fccbae 100644
--- a/src/cxml.h
+++ b/src/cxml.h
@@ -26,7 +26,7 @@
#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
@@ -223,8 +223,8 @@ public:
std::shared_ptr<Node> node_child (std::string) const;
std::shared_ptr<Node> optional_node_child (std::string) const;
- std::list<std::shared_ptr<Node> > node_children () const;
- std::list<std::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;
@@ -234,7 +234,7 @@ protected:
xmlpp::Node* _node;
private:
- mutable std::list<std::string> _taken;
+ mutable std::vector<std::string> _taken;
};
typedef std::shared_ptr<cxml::Node> NodePtr;