Add some missing includes. Fix C++ for GCC 3.4+.

5 files changed, 57 insertions, 1 deletions

diff --git a/lang/maude/distinfo b/lang/maude/distinfo
index 45bc0c05b56..5a0049e2959 100644
--- a/lang/maude/distinfo
+++ b/lang/maude/distinfo
@@ -1,5 +1,9 @@
-$NetBSD: distinfo,v 1.5 2005/10/14 19:54:39 tonio Exp $
+$NetBSD: distinfo,v 1.6 2006/05/02 13:31:55 joerg Exp $
 
 SHA1 (Maude-2.1.1.tar.gz) = 6433ab534970c65bfdde3ea67d1067ad1c7bd9e3
 RMD160 (Maude-2.1.1.tar.gz) = 22793ee2c339a86e44e49dee56943c8b1099ee0b
 Size (Maude-2.1.1.tar.gz) = 1174764 bytes
+SHA1 (patch-aa) = 41888233aaac6af9d77072c15176c0ad0c274cd7
+SHA1 (patch-ab) = ff1caa60e4b57dd6a847e28d25efa9be8474f15a
+SHA1 (patch-ac) = d77e8e817cb33c2594eacfa0cb44b20b63e71b8f
+SHA1 (patch-ad) = 2645f9e3cfa25ab2b66121fe76f63025092a387a
diff --git a/lang/maude/patches/patch-aa b/lang/maude/patches/patch-aa
new file mode 100644
index 00000000000..af03945d134
--- /dev/null
+++ b/lang/maude/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2006/05/02 13:31:55 joerg Exp $
+
+--- src/Utility/indexedSet.hh.orig	2006-03-19 16:06:06.000000000 +0000
++++ src/Utility/indexedSet.hh
+@@ -79,7 +79,7 @@ inline int
+ IndexedSet<T>::insert(const T& element)
+ {
+   pair<typename EltMap::iterator, bool> p =
+-    eltMap.insert(EltMap::value_type(element, indexMap.size()));
++    eltMap.insert(typename EltMap::value_type(element, indexMap.size()));
+   if (p.second)
+     indexMap.push_back(p.first);
+   return p.first->second;
diff --git a/lang/maude/patches/patch-ab b/lang/maude/patches/patch-ab
new file mode 100644
index 00000000000..03386cad468
--- /dev/null
+++ b/lang/maude/patches/patch-ab
@@ -0,0 +1,14 @@
+$NetBSD: patch-ab,v 1.1 2006/05/02 13:31:55 joerg Exp $
+
+--- src/Core/argVec.hh.orig	2006-05-02 13:02:12.000000000 +0000
++++ src/Core/argVec.hh
+@@ -91,6 +91,9 @@ private:
+   pointer basePtr;
+ };
+ 
++#include "dagNode.hh"
++#include "memoryCell.hh"
++
+ template<class T>
+ inline
+ ArgVec<T>::ArgVec(size_type length)
diff --git a/lang/maude/patches/patch-ac b/lang/maude/patches/patch-ac
new file mode 100644
index 00000000000..88020a14ec1
--- /dev/null
+++ b/lang/maude/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2006/05/02 13:31:55 joerg Exp $
+
+--- src/Interface/dagNode.hh.orig	2006-05-02 13:09:05.000000000 +0000
++++ src/Interface/dagNode.hh
+@@ -181,6 +181,7 @@ private:  
+ ostream& operator<<(ostream& s, DagNode* dagNode);
+ 
+ #include "memoryCell.hh"
++#include "symbol.hh"
+ 
+ inline MemoryCell*
+ DagNode::getMemoryCell()
diff --git a/lang/maude/patches/patch-ad b/lang/maude/patches/patch-ad
new file mode 100644
index 00000000000..07c64b0f608
--- /dev/null
+++ b/lang/maude/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2006/05/02 13:31:55 joerg Exp $
+
+--- src/FreeTheory/freeDagNode.hh.orig	2006-05-02 13:15:15.000000000 +0000
++++ src/FreeTheory/freeDagNode.hh
+@@ -87,7 +87,7 @@ FreeDagNode::FreeDagNode(Symbol* symbol)
+   if (nrArgs > nrWords)
+     {
+       setCallDtor();  // need our dtor called when garbage collected so we can free arg array
+-      external = new (DagNode*)[nrArgs];
++      external = new DagNode*[nrArgs];
+     }
+ }
+