Merge pull request #370 from Uhlisys/master

Correct LDC Specific C++11 Violation

Author: dnadlinger

dmd2/mars.c

@@ -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;

driver/main.cpp

@@ -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