From b515ec10a7932e1a01d5aa930ca406836c604605 Mon Sep 17 00:00:00 2001
From: jez_higgins <>
Date: Sun, 7 Aug 2005 20:16:02 +0000
Subject: [PATCH] fixes to silence gcc warnings

---
 DOM/NamedNodeMap.h                     |  2 +
 DOM/NodeList.h                         |  2 +
 SAX/SAX.vcproj                         | 69 ++++++++++++++++++++++++++
 SAX/wrappers/saxlibxml2.h              |  3 ++
 Utils/impl/codecvt_specialisations.cpp |  5 ++
 Utils/impl/codecvt_specialisations.h   |  2 +
 XPath/impl/xpath_function_resolver.hpp |  2 +
 test/XPath/node_test_test.cpp          |  1 -
 8 files changed, 85 insertions(+), 1 deletion(-)

diff --git a/DOM/NamedNodeMap.h b/DOM/NamedNodeMap.h
index f48b3cfc..2ec65140 100644
--- a/DOM/NamedNodeMap.h
+++ b/DOM/NamedNodeMap.h
@@ -69,6 +69,8 @@ template<class stringT>
 class NamedNodeMap_impl 
 {
   public:
+    virtual ~NamedNodeMap_impl() { }
+
     ///////////////////////////////////////////////////////
     // Ref counting
     virtual void addRef() = 0;
diff --git a/DOM/NodeList.h b/DOM/NodeList.h
index 39f48d69..450fa015 100644
--- a/DOM/NodeList.h
+++ b/DOM/NodeList.h
@@ -48,6 +48,8 @@ template<class stringT>
 class NodeList_impl 
 {
   public:
+    virtual ~NodeList_impl() { }
+
     ///////////////////////////////////////////////////////
     // Ref counting
     virtual void addRef() = 0;
diff --git a/SAX/SAX.vcproj b/SAX/SAX.vcproj
index adc253b2..845cbc19 100644
--- a/SAX/SAX.vcproj
+++ b/SAX/SAX.vcproj
@@ -448,15 +448,84 @@
 		<Filter
 			Name="XPath"
 			Filter="">
+			<File
+				RelativePath="..\XPath\impl\xpath_arithmetic.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_ast.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_ast_ids.hpp">
+			</File>
 			<File
 				RelativePath="..\XPath\src\xpath_axis_enumerator.cpp">
 			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_axis_enumerator.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_compile_context.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_execution_context.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_function.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_function_holder.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_function_resolver.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_grammar.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_logical.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_namespace_context.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_namespace_node.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_node_test.hpp">
+			</File>
 			<File
 				RelativePath="..\XPath\src\xpath_object.cpp">
 			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_object.hpp">
+			</File>
 			<File
 				RelativePath="..\XPath\src\xpath_parser.cpp">
 			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_parser.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_relational.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_resolver_holder.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_step.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_union.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_value.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_variable.hpp">
+			</File>
+			<File
+				RelativePath="..\XPath\impl\xpath_variable_resolver.hpp">
+			</File>
 		</Filter>
 		<File
 			RelativePath="ArabicaConfig.S">
diff --git a/SAX/wrappers/saxlibxml2.h b/SAX/wrappers/saxlibxml2.h
index 6daae350..2137a147 100644
--- a/SAX/wrappers/saxlibxml2.h
+++ b/SAX/wrappers/saxlibxml2.h
@@ -41,6 +41,9 @@ extern "C"
 
 class libxml2_base
 {
+  protected:
+    virtual ~libxml2_base() { }
+
   private:
     virtual void SAXstartDocument() = 0;
     virtual void SAXendDocument() = 0;
diff --git a/Utils/impl/codecvt_specialisations.cpp b/Utils/impl/codecvt_specialisations.cpp
index 02fdf3be..5839f27a 100644
--- a/Utils/impl/codecvt_specialisations.cpp
+++ b/Utils/impl/codecvt_specialisations.cpp
@@ -6,6 +6,11 @@
 namespace std
 {
 
+codecvt<char, wchar_t, mbstate_t>::
+~codecvt() 
+{
+} // ~codecvt
+
 ////////////////////////////////////////////////////////////////////////
 codecvt_base::result 
 codecvt<char, wchar_t, mbstate_t>:: 
diff --git a/Utils/impl/codecvt_specialisations.h b/Utils/impl/codecvt_specialisations.h
index d6b0edac..9557293b 100644
--- a/Utils/impl/codecvt_specialisations.h
+++ b/Utils/impl/codecvt_specialisations.h
@@ -10,6 +10,8 @@ template<>
 class codecvt<char, wchar_t, std::mbstate_t> 
 {
 protected:
+  virtual ~codecvt();
+
   virtual codecvt_base::result do_out(mbstate_t&,
                                       const char* from,
                                       const char* from_end,
diff --git a/XPath/impl/xpath_function_resolver.hpp b/XPath/impl/xpath_function_resolver.hpp
index 77ada120..8bb01fdb 100644
--- a/XPath/impl/xpath_function_resolver.hpp
+++ b/XPath/impl/xpath_function_resolver.hpp
@@ -21,6 +21,8 @@ public:
 class FunctionResolver
 {
 public:
+  virtual ~FunctionResolver() { }
+
   // TODO: should make this a QName
   virtual XPathFunction* resolveFunction(const std::string& name,
                                          const std::vector<XPathExpressionPtr>& argExprs) const = 0; 
diff --git a/test/XPath/node_test_test.cpp b/test/XPath/node_test_test.cpp
index 2dee289b..bb83a3a3 100644
--- a/test/XPath/node_test_test.cpp
+++ b/test/XPath/node_test_test.cpp
@@ -260,4 +260,3 @@ TestSuite* NodeTestTest_suite()
   return suiteOfTests;
 } // NodeTestTest_suite
 
-  
\ No newline at end of file