From 0ae9cc3b5b2dfbaef022a1d22ff28747a1af9936 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Thu, 7 Nov 2013 16:14:19 -0600 Subject: [PATCH] #ifdef libxml2 stuff for when we don't have it --- include/pdal/XMLSchema.hpp | 3 ++- src/XMLSchema.cpp | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/include/pdal/XMLSchema.hpp b/include/pdal/XMLSchema.hpp index 4d36ec0c67..5133f281b9 100644 --- a/include/pdal/XMLSchema.hpp +++ b/include/pdal/XMLSchema.hpp @@ -153,12 +153,13 @@ class PDAL_DLL Reader Reader& operator=(const Reader&); // not implemented Reader(const Reader&); // not implemented; + +#ifdef PDAL_HAVE_LIBXML2 pdal::Metadata LoadMetadata(xmlNode* node); std::string remapOldNames(std::string const& input); -#ifdef PDAL_HAVE_LIBXML2 DocPtr m_doc; DocPtr m_schema_doc; diff --git a/src/XMLSchema.cpp b/src/XMLSchema.cpp index 4267a2fc4f..295c053c25 100644 --- a/src/XMLSchema.cpp +++ b/src/XMLSchema.cpp @@ -404,12 +404,12 @@ std::string Reader::remapOldNames(std::string const& input) return input; } +#ifdef PDAL_HAVE_LIBXML2 pdal::Metadata Reader::LoadMetadata(xmlNode* startNode) { pdal::Metadata output; -#ifdef PDAL_HAVE_LIBXML2 xmlNode* node = startNode; @@ -461,9 +461,9 @@ pdal::Metadata Reader::LoadMetadata(xmlNode* startNode) else node = node->next; } -#endif return output; } +#endif void Reader::Load() {