Changes For Bug 352

[oota-llvm.git] / include / llvm / Support / TypeInfo.h

diff --git a/include/llvm/Support/TypeInfo.h b/include/llvm/Support/TypeInfo.h
index aa2093a43db2c96361b74ce347a05138a0bccf86..54043af9defbbb30e2767403be7792f15af5177c 100644 (file)
--- a/include/llvm/Support/TypeInfo.h
+++ b/include/llvm/Support/TypeInfo.h
@@ -1,4 +1,4 @@
-//===- Support/TypeInfo.h - Support class for type_info objects -*- C++ -*-===//
+//===- llvm/Support/TypeInfo.h - Support for type_info objects -*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -13,11 +13,13 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_TYPEINFO_H
-#define SUPPORT_TYPEINFO_H
+#ifndef LLVM_SUPPORT_TYPEINFO_H
+#define LLVM_SUPPORT_TYPEINFO_H
 
 #include <typeinfo>
 
+namespace llvm {
+
 struct TypeInfo {
   TypeInfo() {                     // needed for containers
     struct Nil {};  // Anonymous class distinct from all others...
@@ -34,7 +36,7 @@ struct TypeInfo {
 
   // Compatibility functions
   bool before(const TypeInfo &rhs) const {
-    return Info->before(*rhs.Info);
+    return Info->before(*rhs.Info) != 0;
   }
   const char *getClassName() const {
     return Info->name();
@@ -69,4 +71,6 @@ inline bool operator>=(const TypeInfo &lhs, const TypeInfo &rhs) {
   return !(lhs < rhs);
 }
 
+} // End llvm namespace
+
 #endif