X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FSupport%2FCasting.h;h=48988f8a6bb8354c71326e634364acbb2895b4b2;hb=b8158acc23f5f0bf235fb1c6a8182a38ec9b00b2;hp=065919c1792a87c71cc491e3c464cb4418f1eeca;hpb=b2109ce97881269a610fa4afbcbca350e975174d;p=oota-llvm.git

diff --git a/include/llvm/Support/Casting.h b/include/llvm/Support/Casting.h
index 065919c1792..48988f8a6bb 100644
--- a/include/llvm/Support/Casting.h
+++ b/include/llvm/Support/Casting.h
@@ -1,10 +1,10 @@
-//===-- Support/Casting.h - Allow flexible, checked, casts ------*- C++ -*-===//
-// 
+//===-- 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>(),
@@ -12,8 +12,12 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_CASTING_H
-#define SUPPORT_CASTING_H
+#ifndef LLVM_SUPPORT_CASTING_H
+#define LLVM_SUPPORT_CASTING_H
+
+#include <cassert>
+
+namespace llvm {
 
 //===----------------------------------------------------------------------===//
 //                          isa<x> Support Templates
@@ -35,7 +39,7 @@ template<typename From> struct simplify_type {
 template<typename From> struct simplify_type<const From> {
   typedef const From SimpleType;
   static SimpleType &getSimplifiedValue(const From &Val) {
-    return simplify_type<From>::getSimplifiedValue((From&)Val);
+    return simplify_type<From>::getSimplifiedValue(static_cast<From&>(Val));
   }
 };
 
@@ -46,7 +50,7 @@ template<typename From> struct simplify_type<const From> {
 //  if (isa<Type*>(myVal)) { ... }
 //
 template <typename To, typename From>
-inline bool isa_impl(const From &Val) { 
+inline bool isa_impl(const From &Val) {
   return To::classof(&Val);
 }
 
@@ -55,7 +59,7 @@ 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));
   }
 };
@@ -157,7 +161,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;
 };
 
@@ -176,7 +180,8 @@ 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 (typename cast_retty<To, FromTy>::ret_type)Val;
+    return reinterpret_cast<typename cast_retty<To, FromTy>::ret_type>(
+                         const_cast<FromTy&>(Val));
   }
 };
 
@@ -216,7 +221,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;
 }
 
@@ -224,13 +229,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/Streams.h"
 
 struct bar {
   bar() {}
@@ -245,7 +250,7 @@ struct foo {
     }*/
 };
 
-template <> inline bool isa_impl<foo,bar>(const bar &Val) { 
+template <> inline bool isa_impl<foo,bar>(const bar &Val) {
   cerr << "Classof: " << &Val << "\n";
   return true;
 }
@@ -276,7 +281,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&
@@ -293,4 +298,6 @@ void main() {
 
 #endif
 
+} // End llvm namespace
+
 #endif