Better error.

[libcxml.git] / src / cxml.h

diff --git a/src/cxml.h b/src/cxml.h
index eea15f5eb3f3cf4872c6e6d507c9fe048109195a..75af36b401a719e34a5fd4c3c80cb77b4902c15e 100644 (file)
--- a/src/cxml.h
+++ b/src/cxml.h
@@ -27,6 +27,12 @@
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string/erase.hpp>
+
+/* Hack for OS X compile failure; see https://bugs.launchpad.net/hugin/+bug/910160 */
+#ifdef check
+#undef check
+#endif
+
 #include <glibmm.h>
 
 namespace xmlpp {
@@ -178,7 +184,7 @@ public:
                u.imbue (std::locale::classic ());
                u << t;
                T n;
-               t >> n;
+               u >> n;
                return n;
        }
 
@@ -208,18 +214,25 @@ private:
 };
 
 typedef boost::shared_ptr<cxml::Node> NodePtr;
+typedef boost::shared_ptr<const cxml::Node> ConstNodePtr;
 
 class Document : public Node
 {
 public:
+       Document ();
        Document (std::string root_name);
        Document (std::string root_name, boost::filesystem::path);
 
+       virtual ~Document ();
+
        void read_file (boost::filesystem::path);
        void read_stream (std::istream &);
+       void read_string (std::string);
        
-       virtual ~Document ();
-
+       std::string root_name () const {
+               return _root_name;
+       }
+              
 private:
        void take_root_node ();