Merge pull request #370 from Uhlisys/master

Correct LDC Specific C++11 Violation
This commit is contained in:
David Nadlinger
2013-05-31 08:42:14 -07:00
2 changed files with 2 additions and 2 deletions

View File

@@ -103,7 +103,7 @@ Global::Global()
#if IN_LLVM
version = "v2.062";
ldc_version = "trunk";
llvm_version = "LLVM "LDC_LLVM_VERSION_STRING;
llvm_version = "LLVM " LDC_LLVM_VERSION_STRING;
#endif
global.structalign = STRUCTALIGN_DEFAULT;

View File

@@ -620,7 +620,7 @@ int main(int argc, char** argv)
// Expose LLVM version to runtime
#define STR(x) #x
#define XSTR(x) STR(x)
VersionCondition::addPredefinedGlobalIdent("LDC_LLVM_"XSTR(LDC_LLVM_VER));
VersionCondition::addPredefinedGlobalIdent("LDC_LLVM_" XSTR(LDC_LLVM_VER));
#undef XSTR
#undef STR