summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-02-03 13:28:12 +0000
committerCarl Hetherington <cth@carlh.net>2016-02-03 13:28:12 +0000
commit005dac1a29f748bfe81ff87b15bcf085a4f510a3 (patch)
tree88454f2df16b827cc4602a7269af86f6e91347e7
parente33e3b8ade11309ce508ea79f2061b074c33d69c (diff)
A little #include tidying.
-rw-r--r--src/cpl.cc1
-rw-r--r--src/cpl.h1
-rw-r--r--src/reel.h5
-rw-r--r--test/cpl_sar_test.cc1
4 files changed, 6 insertions, 2 deletions
diff --git a/src/cpl.cc b/src/cpl.cc
index 0677ec36..c408fe97 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -30,6 +30,7 @@
#include "dcp_assert.h"
#include "compose.hpp"
#include <libxml/parser.h>
+#include <libxml++/libxml++.h>
#include <boost/foreach.hpp>
using std::string;
diff --git a/src/cpl.h b/src/cpl.h
index b616aeaa..6ad410b4 100644
--- a/src/cpl.h
+++ b/src/cpl.h
@@ -29,7 +29,6 @@
#include "key.h"
#include "asset.h"
#include "metadata.h"
-#include <libxml++/libxml++.h>
#include <boost/shared_ptr.hpp>
#include <boost/function.hpp>
#include <boost/optional.hpp>
diff --git a/src/reel.h b/src/reel.h
index 7711d101..8d7546fa 100644
--- a/src/reel.h
+++ b/src/reel.h
@@ -23,7 +23,6 @@
#include "key.h"
#include "types.h"
#include "ref.h"
-#include <libxml++/libxml++.h>
#include <boost/shared_ptr.hpp>
#include <boost/function.hpp>
#include <list>
@@ -32,6 +31,10 @@ namespace cxml {
class Node;
}
+namespace xmlpp {
+ class Element;
+}
+
namespace dcp {
class DecryptedKDM;
diff --git a/test/cpl_sar_test.cc b/test/cpl_sar_test.cc
index 92e38a00..3f5b07d1 100644
--- a/test/cpl_sar_test.cc
+++ b/test/cpl_sar_test.cc
@@ -21,6 +21,7 @@
#include "reel_mono_picture_asset.h"
#include "mono_picture_asset.h"
#include <libcxml/cxml.h>
+#include <libxml++/libxml++.h>
#include <boost/test/unit_test.hpp>
using boost::shared_ptr;