[PATCH] Wrap.h: Fix dependency layering issues caused by r180112

[Eric Christopher]

LGTM. :)

-eric

On Tue, Apr 23, 2013 at 10:56 PM, Tom Stellard <tom at stellard.net> wrote:
> From: Tom Stellard <thomas.stellard at amd.com>
>
> ---
>  include/llvm/ExecutionEngine/ExecutionEngine.h  | 4 ++++
>  include/llvm/Wrap.h                             | 2 --
>  lib/ExecutionEngine/ExecutionEngineBindings.cpp | 1 -
>  3 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/include/llvm/ExecutionEngine/ExecutionEngine.h b/include/llvm/ExecutionEngine/ExecutionEngine.h
> index 3fd69e266..733e64a 100644
> --- a/include/llvm/ExecutionEngine/ExecutionEngine.h
> +++ b/include/llvm/ExecutionEngine/ExecutionEngine.h
> @@ -15,6 +15,7 @@
>  #ifndef LLVM_EXECUTIONENGINE_EXECUTIONENGINE_H
>  #define LLVM_EXECUTIONENGINE_EXECUTIONENGINE_H
>
> +#include "llvm-c/ExecutionEngine.h"
>  #include "llvm/ADT/DenseMap.h"
>  #include "llvm/ADT/SmallVector.h"
>  #include "llvm/ADT/StringRef.h"
> @@ -25,6 +26,7 @@
>  #include "llvm/Support/ValueHandle.h"
>  #include "llvm/Target/TargetMachine.h"
>  #include "llvm/Target/TargetOptions.h"
> +#include "llvm/Wrap.h"
>  #include <map>
>  #include <string>
>  #include <vector>
> @@ -625,6 +627,8 @@ public:
>    ExecutionEngine *create(TargetMachine *TM);
>  };
>
> +DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine,    LLVMExecutionEngineRef)
> +
>  } // End llvm namespace
>
>  #endif
> diff --git a/include/llvm/Wrap.h b/include/llvm/Wrap.h
> index 11ea6e4..79790d4 100644
> --- a/include/llvm/Wrap.h
> +++ b/include/llvm/Wrap.h
> @@ -12,7 +12,6 @@
>  //===----------------------------------------------------------------------===//
>
>  #include "llvm-c/Core.h"
> -#include "llvm-c/ExecutionEngine.h"
>  #include "llvm/IR/BasicBlock.h"
>  #include "llvm/IR/IRBuilder.h"
>  #include "llvm/IR/Module.h"
> @@ -68,7 +67,6 @@ namespace llvm {
>    DEFINE_SIMPLE_CONVERSION_FUNCTIONS(MemoryBuffer,       LLVMMemoryBufferRef  )
>    DEFINE_SIMPLE_CONVERSION_FUNCTIONS(LLVMContext,        LLVMContextRef       )
>    DEFINE_SIMPLE_CONVERSION_FUNCTIONS(Use,                LLVMUseRef           )
> -  DEFINE_SIMPLE_CONVERSION_FUNCTIONS(ExecutionEngine,    LLVMExecutionEngineRef)
>    DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassManagerBase,    LLVMPassManagerRef   )
>    DEFINE_STDCXX_CONVERSION_FUNCTIONS(PassRegistry,       LLVMPassRegistryRef  )
>
> diff --git a/lib/ExecutionEngine/ExecutionEngineBindings.cpp b/lib/ExecutionEngine/ExecutionEngineBindings.cpp
> index f18cb0d..3e6dcdf 100644
> --- a/lib/ExecutionEngine/ExecutionEngineBindings.cpp
> +++ b/lib/ExecutionEngine/ExecutionEngineBindings.cpp
> @@ -16,7 +16,6 @@
>  #include "llvm/ExecutionEngine/ExecutionEngine.h"
>  #include "llvm/ExecutionEngine/GenericValue.h"
>  #include "llvm/Support/ErrorHandling.h"
> -#include "llvm/Wrap.h"
>  #include <cstring>
>
>  using namespace llvm;
> --
> 1.8.1.5
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits