[llvm] r208684 - Fix build failure with MSVC, following r208680

Artyom Skrobov Artyom.Skrobov at arm.com
Tue May 13 04:16:23 PDT 2014


Author: askrobov
Date: Tue May 13 06:16:22 2014
New Revision: 208684

URL: http://llvm.org/viewvc/llvm-project?rev=208684&view=rev
Log:
Fix build failure with MSVC, following r208680

Modified:
    llvm/trunk/include/llvm/IR/DataLayout.h

Modified: llvm/trunk/include/llvm/IR/DataLayout.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/IR/DataLayout.h?rev=208684&r1=208683&r2=208684&view=diff
==============================================================================
--- llvm/trunk/include/llvm/IR/DataLayout.h (original)
+++ llvm/trunk/include/llvm/IR/DataLayout.h Tue May 13 06:16:22 2014
@@ -27,6 +27,9 @@
 #include "llvm/Pass.h"
 #include "llvm/Support/DataTypes.h"
 
+// this needs to be outside of the namespace, to avoid conflict with llvm-c decl
+typedef struct LLVMOpaqueTargetData *LLVMTargetDataRef;
+
 namespace llvm {
 
 class Value;
@@ -445,8 +448,6 @@ public:
   }
 };
 
-typedef struct LLVMOpaqueTargetData *LLVMTargetDataRef;
-
 inline DataLayout *unwrap(LLVMTargetDataRef P) {
    return reinterpret_cast<DataLayout*>(P);
 }





More information about the llvm-commits mailing list