From fbc5aa44c6bf39c068947f6b0c7643d5229c70a7 Mon Sep 17 00:00:00 2001
From: Scott Cantor <cantor.2@osu.edu>
Date: Fri, 11 May 2007 00:01:22 +0000
Subject: [PATCH] Missing signal header, tighten up template for map cleanup.

---
 xmltooling/base.h         | 6 +++---
 xmltooling/util/Threads.h | 2 ++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/xmltooling/base.h b/xmltooling/base.h
index 4c6e8dc..cb13d98 100644
--- a/xmltooling/base.h
+++ b/xmltooling/base.h
@@ -77,7 +77,7 @@
 #define MAKE_NONCOPYABLE(type) \
     private: \
         type(const type&); \
-        type& operator=(const type&);
+        type& operator=(const type&)
 
 #ifndef DOXYGEN_SKIP
 #ifndef NULL
@@ -1509,7 +1509,7 @@ namespace xmltooling {
          * 
          * @param p   a pair in which the second component is the object to delete
          */
-        void operator()(const std::pair<A,B*>& p) {delete p.second;}
+        void operator()(const std::pair<const A,B*>& p) {delete p.second;}
     };
 
     /**
@@ -1522,7 +1522,7 @@ namespace xmltooling {
          * 
          * @param p   a pair in which the second component is the const object to delete
          */
-        void operator()(const std::pair<A,const B*>& p) {delete const_cast<B*>(p.second);}
+        void operator()(const std::pair<const A,const B*>& p) {delete const_cast<B*>(p.second);}
     };
 };
 
diff --git a/xmltooling/util/Threads.h b/xmltooling/util/Threads.h
index f6fe5ff..40bd093 100644
--- a/xmltooling/util/Threads.h
+++ b/xmltooling/util/Threads.h
@@ -26,6 +26,8 @@
 #include <xmltooling/base.h>
 #include <xmltooling/exceptions.h>
 
+#include <signal.h>
+
 namespace xmltooling
 {
     DECL_XMLTOOLING_EXCEPTION(ThreadingException,XMLTOOL_EXCEPTIONAPI(XMLTOOL_API),xmltooling,XMLToolingException,Exceptions during threading/locking operations);
-- 
2.1.4