From: Chris Lattner <sabre@nondot.org>
Date: Wed, 24 Jul 2002 22:34:01 +0000 (+0000)
Subject: GCC 3.1 changes
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=3f5569152c579ef820bfaea088599312b0590826;p=oota-llvm.git

GCC 3.1 changes


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3070 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h
index 674a5f0a1ed..b008b6e6a72 100644
--- a/include/llvm/Analysis/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure.h
@@ -49,9 +49,15 @@ public:
   bool operator!=(const DSNodeHandle &H) const { return N != H.N; }
   bool operator==(const DSNode *Node) const { return N == Node; }
   bool operator!=(const DSNode *Node) const { return N != Node; }
+  bool operator==(DSNode *Node) const { return N == Node; }
+  bool operator!=(DSNode *Node) const { return N != Node; }
 
   // Avoid having comparisons to null cause errors...
-  bool operator==(int X) const { return operator==((DSNode*)X); }
+  bool operator==(int X) const {
+    assert(X == 0 && "Bad comparison!");
+    return operator==((DSNode*)0);
+  }
+  bool operator!=(int X) const { return !operator==(X); }
 
   // Allow explicit conversion to DSNode...
   DSNode *get() { return N; }
diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index 674a5f0a1ed..b008b6e6a72 100644
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -49,9 +49,15 @@ public:
   bool operator!=(const DSNodeHandle &H) const { return N != H.N; }
   bool operator==(const DSNode *Node) const { return N == Node; }
   bool operator!=(const DSNode *Node) const { return N != Node; }
+  bool operator==(DSNode *Node) const { return N == Node; }
+  bool operator!=(DSNode *Node) const { return N != Node; }
 
   // Avoid having comparisons to null cause errors...
-  bool operator==(int X) const { return operator==((DSNode*)X); }
+  bool operator==(int X) const {
+    assert(X == 0 && "Bad comparison!");
+    return operator==((DSNode*)0);
+  }
+  bool operator!=(int X) const { return !operator==(X); }
 
   // Allow explicit conversion to DSNode...
   DSNode *get() { return N; }