MC: Move COFF enumeration constants to llvm/Support/COFF.h, patch by Michael

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

diff --git a/include/llvm/Support/Casting.h b/include/llvm/Support/Casting.h
index d18975486571a00313d0bb6e7c295cc10126260c..dccbfadfa3051fa5d577c7aba18d69ee6de4f32d 100644 (file)
--- a/include/llvm/Support/Casting.h
+++ b/include/llvm/Support/Casting.h
@@ -1,10 +1,10 @@
 //===-- llvm/Support/Casting.h - Allow flexible, checked, casts -*- C++ -*-===//
-// 
+//
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
-// 
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
 //===----------------------------------------------------------------------===//
 //
 // This file defines the isa<X>(), cast<X>(), dyn_cast<X>(), cast_or_null<X>(),
@@ -15,6 +15,8 @@
 #ifndef LLVM_SUPPORT_CASTING_H
 #define LLVM_SUPPORT_CASTING_H
 
+#include <cassert>
+
 namespace llvm {
 
 //===----------------------------------------------------------------------===//
@@ -48,16 +50,18 @@ template<typename From> struct simplify_type<const From> {
 //  if (isa<Type*>(myVal)) { ... }
 //
 template <typename To, typename From>
-inline bool isa_impl(const From &Val) { 
-  return To::classof(&Val);
-}
+struct isa_impl {
+  static inline bool doit(const From &Val) {
+    return To::classof(&Val);
+  }
+};
 
 template<typename To, typename From, typename SimpleType>
 struct isa_impl_wrap {
   // When From != SimplifiedType, we can simplify the type some more by using
   // the simplify_type template.
   static bool doit(const From &Val) {
-    return isa_impl_cl<const SimpleType>::template 
+    return isa_impl_cl<const SimpleType>::template
                     isa<To>(simplify_type<const From>::getSimplifiedValue(Val));
   }
 };
@@ -66,7 +70,7 @@ template<typename To, typename FromTy>
 struct isa_impl_wrap<To, const FromTy, const FromTy> {
   // When From == SimpleType, we are as simple as we are going to get.
   static bool doit(const FromTy &Val) {
-    return isa_impl<To,FromTy>(Val);
+    return isa_impl<To,FromTy>::doit(Val);
   }
 };
 
@@ -159,7 +163,7 @@ struct cast_retty_wrap<To, FromTy, FromTy> {
 
 template<class To, class From>
 struct cast_retty {
-  typedef typename cast_retty_wrap<To, From, 
+  typedef typename cast_retty_wrap<To, From,
                    typename simplify_type<From>::SimpleType>::ret_type ret_type;
 };
 
@@ -178,8 +182,9 @@ template<class To, class From, class SimpleFrom> struct cast_convert_val {
 template<class To, class FromTy> struct cast_convert_val<To,FromTy,FromTy> {
   // This _is_ a simple type, just cast it.
   static typename cast_retty<To, FromTy>::ret_type doit(const FromTy &Val) {
-    return reinterpret_cast<typename cast_retty<To, FromTy>::ret_type>(
-                         const_cast<FromTy&>(Val));
+    typename cast_retty<To, FromTy>::ret_type Res2
+     = (typename cast_retty<To, FromTy>::ret_type)const_cast<FromTy&>(Val);
+    return Res2;
   }
 };
 
@@ -219,7 +224,7 @@ inline typename cast_retty<X, Y*>::ret_type cast_or_null(Y *Val) {
 //
 
 template <class X, class Y>
-inline typename cast_retty<X, Y>::ret_type dyn_cast(Y Val) {
+inline typename cast_retty<X, Y>::ret_type dyn_cast(const Y &Val) {
   return isa<X>(Val) ? cast<X, Y>(Val) : 0;
 }
 
@@ -227,13 +232,13 @@ inline typename cast_retty<X, Y>::ret_type dyn_cast(Y Val) {
 // value is accepted.
 //
 template <class X, class Y>
-inline typename cast_retty<X, Y>::ret_type dyn_cast_or_null(Y Val) {
+inline typename cast_retty<X, Y>::ret_type dyn_cast_or_null(const Y &Val) {
   return (Val && isa<X>(Val)) ? cast<X, Y>(Val) : 0;
 }
 
 
 #ifdef DEBUG_CAST_OPERATORS
-#include <iostream>
+#include "llvm/Support/raw_ostream.h"
 
 struct bar {
   bar() {}
@@ -248,10 +253,12 @@ struct foo {
     }*/
 };
 
-template <> inline bool isa_impl<foo,bar>(const bar &Val) { 
-  cerr << "Classof: " << &Val << "\n";
-  return true;
-}
+template <> struct isa_impl<foo,bar> {
+  static inline bool doit(const bar &Val) {
+    dbgs() << "Classof: " << &Val << "\n";
+    return true;
+  }
+};
 
 
 bar *fub();
@@ -279,7 +286,7 @@ void test(bar &B1, const bar *B2) {
   const foo *F12 = cast_or_null<foo>(B2);
   const foo *F13 = cast_or_null<foo>(B4);
   const foo *F14 = cast_or_null<foo>(fub());  // Shouldn't print.
-  
+
   // These lines are errors...
   //foo *F20 = cast<foo>(B2);  // Yields const foo*
   //foo &F21 = cast<foo>(B3);  // Yields const foo&