summaryrefslogtreecommitdiffstats
path: root/src/removeoverlap
diff options
context:
space:
mode:
authorRalf Stephan <ralf@ark.in-berlin.de>2006-02-21 15:25:19 +0000
committerrwst <rwst@users.sourceforge.net>2006-02-21 15:25:19 +0000
commit3652363d6ea8b1290b520dbb817d40d74aecd99d (patch)
treefd07cbf29a824bffce428ce73363d647806f7150 /src/removeoverlap
parentrename present()->presdentPage(), removes compiler warnings (diff)
downloadinkscape-3652363d6ea8b1290b520dbb817d40d74aecd99d.tar.gz
inkscape-3652363d6ea8b1290b520dbb817d40d74aecd99d.zip
introduce orthogonal template declaration, fixes compiler warnings
(bzr r172)
Diffstat (limited to 'src/removeoverlap')
-rw-r--r--src/removeoverlap/pairingheap/PairingHeap.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/removeoverlap/pairingheap/PairingHeap.h b/src/removeoverlap/pairingheap/PairingHeap.h
index 1c0160141..f8c3abf35 100644
--- a/src/removeoverlap/pairingheap/PairingHeap.h
+++ b/src/removeoverlap/pairingheap/PairingHeap.h
@@ -44,7 +44,9 @@ class PairingHeap;
template <class T>
class PairNode
{
- friend std::ostream& operator <<(std::ostream &os,const PairingHeap<T> &b);
+ template <class U>
+ friend std::ostream& operator <<(std::ostream &os,const PairingHeap<U> &b);
+
T element;
PairNode *leftChild;
PairNode *nextSibling;
@@ -65,7 +67,8 @@ public:
template <class T>
class PairingHeap
{
- friend std::ostream& operator <<(std::ostream &os,const PairingHeap<T> &b);
+ template <class U>
+ friend std::ostream& operator <<(std::ostream &os,const PairingHeap<U> &b);
public:
PairingHeap( bool (*lessThan)(T const &lhs, T const &rhs) );
PairingHeap( const PairingHeap & rhs );