diff options
| author | Diego Novillo <dnovillo@google.com> | 2015-07-27 18:27:23 +0000 |
|---|---|---|
| committer | Diego Novillo <dnovillo@google.com> | 2015-07-27 18:27:23 +0000 |
| commit | cd973c4f77be116206f6f6518e181858f989c09f (patch) | |
| tree | e27fbbbccc4843ed7431aaba889855a02bc119ac /llvm/lib/ExecutionEngine | |
| parent | ba70e9e1e63d88f09403e2643421d1baaed4de41 (diff) | |
| download | bcm5719-llvm-cd973c4f77be116206f6f6518e181858f989c09f.tar.gz bcm5719-llvm-cd973c4f77be116206f6f6518e181858f989c09f.zip | |
Fix ODR violation. NFC.
There is an ODR conflict between lib/ExecutionEngine/ExecutionEngineBindings.cpp
and lib/Target/TargetMachineC.cpp. The inline definitions should simply
be marked static (thanks dblaikie for the hint).
llvm-svn: 243298
Diffstat (limited to 'llvm/lib/ExecutionEngine')
| -rw-r--r-- | llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp b/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp index 892c941a292..f7aba4cec04 100644 --- a/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp +++ b/llvm/lib/ExecutionEngine/ExecutionEngineBindings.cpp @@ -29,7 +29,7 @@ using namespace llvm; DEFINE_SIMPLE_CONVERSION_FUNCTIONS(GenericValue, LLVMGenericValueRef) -inline LLVMTargetMachineRef wrap(const TargetMachine *P) { +static LLVMTargetMachineRef wrap(const TargetMachine *P) { return reinterpret_cast<LLVMTargetMachineRef>(const_cast<TargetMachine*>(P)); } |
