Author: gordon
Date: Fri Sep 28 20:38:42 2007
New Revision: 42465
URL: http://llvm.org/viewvc/llvm-project?rev=42465&view=rev
Log:
Demoting CHelpers.h to include/llvm/Support.
Added:
llvm/trunk/include/llvm/Support/CHelpers.h
- copied unchanged from r42459, llvm/trunk/include/llvm/CHelpers.h
Removed:
llvm/trunk/include/llvm/CHelpers.h
Modified:
llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp
llvm/trunk/lib/VMCore/Core.cpp
Removed: llvm/trunk/include/llvm/CHelpers.h
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/CHelpers.h?rev=42464&view=auto
==============================================================================
--- llvm/trunk/include/llvm/CHelpers.h (original)
+++ llvm/trunk/include/llvm/CHelpers.h (removed)
@@ -1,104 +0,0 @@
-//===-- Support/CHelpers.h - Utilities for writing C bindings
-------------===//
-//
-// 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.
-//
-//===----------------------------------------------------------------------===//
-//
-// These opaque reference<-->pointer conversions are shorter and more tightly
-// typed than writing the casts by hand in C bindings. In assert builds, they
-// will do type checking.
-//
-//===----------------------------------------------------------------------===//
-
-#ifndef LLVM_SUPPORT_CHELPERS_H
-#define LLVM_SUPPORT_CHELPERS_H
-
-#include "llvm/Module.h"
-#include "llvm/Type.h"
-#include "llvm/Value.h"
-
-typedef struct LLVMOpaqueModule *LLVMModuleRef;
-typedef struct LLVMOpaqueType *LLVMTypeRef;
-typedef struct LLVMOpaqueValue *LLVMValueRef;
-
-namespace llvm {
- /// Opaque module conversions
- ///
- inline Module *unwrap(LLVMModuleRef M) {
- return reinterpret_cast<Module*>(M);
- }
-
- inline LLVMModuleRef wrap(Module *M) {
- return reinterpret_cast<LLVMModuleRef>(M);
- }
-
- /// Opaque type conversions
- ///
- inline Type *unwrap(LLVMTypeRef Ty) {
- return reinterpret_cast<Type*>(Ty);
- }
-
- template<typename T>
- inline T *unwrap(LLVMTypeRef Ty) {
- return cast<T>(unwrap(Ty));
- }
-
- inline Type **unwrap(LLVMTypeRef* Tys) {
- return reinterpret_cast<Type**>(Tys);
- }
-
- inline LLVMTypeRef wrap(const Type *Ty) {
- return reinterpret_cast<LLVMTypeRef>(const_cast<Type*>(Ty));
- }
-
- inline LLVMTypeRef *wrap(const Type **Tys) {
- return reinterpret_cast<LLVMTypeRef*>(const_cast<Type**>(Tys));
- }
-
- /// Opaque value conversions
- ///
- inline Value *unwrap(LLVMValueRef Val) {
- return reinterpret_cast<Value*>(Val);
- }
-
- template<typename T>
- inline T *unwrap(LLVMValueRef Val) {
- return cast<T>(unwrap(Val));
- }
-
- inline Value **unwrap(LLVMValueRef *Vals) {
- return reinterpret_cast<Value**>(Vals);
- }
-
- template<typename T>
- inline T **unwrap(LLVMValueRef *Vals, unsigned Length) {
- #if DEBUG
- for (LLVMValueRef *I = Vals, E = Vals + Length; I != E; ++I)
- cast<T>(*I);
- #endif
- return reinterpret_cast<T**>(Vals);
- }
-
- inline LLVMValueRef wrap(const Value *Val) {
- return reinterpret_cast<LLVMValueRef>(const_cast<Value*>(Val));
- }
-
- inline LLVMValueRef *wrap(const Value **Vals) {
- return reinterpret_cast<LLVMValueRef*>(const_cast<Value**>(Vals));
- }
-
- /// Basic block conversions
- ///
- inline BasicBlock *unwrap(LLVMBasicBlockRef BBRef) {
- return reinterpret_cast<BasicBlock*>(BBRef);
- }
-
- inline LLVMBasicBlockRef wrap(const BasicBlock *BB) {
- return reinterpret_cast<LLVMBasicBlockRef>(const_cast<BasicBlock*>(BB));
- }
-}
-
-#endif
Modified: llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp?rev=42465&r1=42464&r2=42465&view=diff
==============================================================================
--- llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp (original)
+++ llvm/trunk/lib/Bitcode/Writer/BitWriter.cpp Fri Sep 28 20:38:42 2007
@@ -8,8 +8,8 @@
//===----------------------------------------------------------------------===//
#include "llvm-c/BitWriter.h"
-#include "llvm/CHelpers.h"
#include "llvm/Bitcode/ReaderWriter.h"
+#include "llvm/Support/CHelpers.h"
#include <fstream>
using namespace llvm;
Modified: llvm/trunk/lib/VMCore/Core.cpp
URL:
http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/VMCore/Core.cpp?rev=42465&r1=42464&r2=42465&view=diff
==============================================================================
--- llvm/trunk/lib/VMCore/Core.cpp (original)
+++ llvm/trunk/lib/VMCore/Core.cpp Fri Sep 28 20:38:42 2007
@@ -14,10 +14,10 @@
#include "llvm-c/Core.h"
#include "llvm/Bitcode/ReaderWriter.h"
-#include "llvm/CHelpers.h"
#include "llvm/Constants.h"
#include "llvm/DerivedTypes.h"
#include "llvm/GlobalVariable.h"
+#include "llvm/Support/CHelpers.h"
#include "llvm/Support/LLVMBuilder.h"
#include "llvm/TypeSymbolTable.h"
#include <cassert>
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
