X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FConstants.h;h=1253974da06c33f26e94e21d1c57deeeb0b725e3;hb=d80e973cec7e30839530d94f84748d99b03b0d9e;hp=95f9a265d29f87e8b188c1c80284a40e638d4e95;hpb=10586abe9a06a63bff703388aed4c41667730f0b;p=oota-llvm.git

diff --git a/include/llvm/Constants.h b/include/llvm/Constants.h
index 95f9a265d29..1253974da06 100644
--- a/include/llvm/Constants.h
+++ b/include/llvm/Constants.h
@@ -5,8 +5,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_CONSTPOOLVALS_H
-#define LLVM_CONSTPOOLVALS_H
+#ifndef LLVM_CONSTANT_VALS_H
+#define LLVM_CONSTANT_VALS_H
 
 #include "llvm/User.h"
 #include "Support/DataTypes.h"
@@ -39,10 +39,10 @@ public:
   virtual void setName(const std::string &name, SymbolTable *ST = 0);
 
   // Static constructor to get a '0' constant of arbitrary type...
-  static Constant *getNullConstant(const Type *Ty);
+  static Constant *getNullValue(const Type *Ty);
 
   // isNullValue - Return true if this is the value that would be returned by
-  // getNullConstant.
+  // getNullValue.
   virtual bool isNullValue() const = 0;
 
   virtual void print(std::ostream &O) const;
@@ -81,7 +81,7 @@ public:
   inline bool getValue() const { return Val; }
 
   // isNullValue - Return true if this is the value that would be returned by
-  // getNullConstant.
+  // getNullValue.
   virtual bool isNullValue() const { return this == False; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -125,7 +125,7 @@ public:
   static ConstantInt *get(const Type *Ty, unsigned char V);
 
   // isNullValue - Return true if this is the value that would be returned by
-  // getNullConstant.
+  // getNullValue.
   virtual bool isNullValue() const { return Val.Unsigned == 0; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -198,7 +198,7 @@ public:
   inline double getValue() const { return Val; }
 
   // isNullValue - Return true if this is the value that would be returned by
-  // getNullConstant.
+  // getNullValue.
   virtual bool isNullValue() const { return Val == 0; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -231,7 +231,7 @@ public:
   inline const std::vector<Use> &getValues() const { return Operands; }
 
   // isNullValue - Return true if this is the value that would be returned by
-  // getNullConstant.
+  // getNullValue.
   virtual bool isNullValue() const { return false; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -264,7 +264,7 @@ public:
   inline const std::vector<Use> &getValues() const { return Operands; }
 
   // isNullValue - Return true if this is the value that would be returned by
-  // getNullConstant.
+  // getNullValue.
   virtual bool isNullValue() const { return false; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -293,7 +293,7 @@ public:
   }
 
   // isNullValue - Return true if this is the value that would be returned by
-  // getNullConstant.
+  // getNullValue.
   virtual bool isNullValue() const { return false; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast:
@@ -316,7 +316,7 @@ public:
   static ConstantPointerNull *get(const PointerType *T);
 
   // isNullValue - Return true if this is the value that would be returned by
-  // getNullConstant.
+  // getNullValue.
   virtual bool isNullValue() const { return true; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast: