From 40f842de9c7e165fc2a6079bb7a36cbdd0ef2a01 Mon Sep 17 00:00:00 2001 From: David Blaikie Date: Thu, 10 Jul 2014 18:46:15 +0000 Subject: [PATCH] Remove use of uniform initialization ({}) introduced in r212725 since this isn't supported in MSVC. llvm-svn: 212754 --- clang/lib/Basic/Targets.cpp | 2 +- clang/lib/Driver/ToolChains.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/clang/lib/Basic/Targets.cpp b/clang/lib/Basic/Targets.cpp index c45a9ca..c118c9c 100644 --- a/clang/lib/Basic/Targets.cpp +++ b/clang/lib/Basic/Targets.cpp @@ -3272,7 +3272,7 @@ namespace { class X86_64TargetInfo : public X86TargetInfo { public: X86_64TargetInfo(const llvm::Triple &Triple) : X86TargetInfo(Triple) { - const bool IsX32{getTriple().getEnvironment() == llvm::Triple::GNUX32}; + const bool IsX32 = getTriple().getEnvironment() == llvm::Triple::GNUX32; LongWidth = LongAlign = PointerWidth = PointerAlign = IsX32 ? 32 : 64; LongDoubleWidth = 128; LongDoubleAlign = 128; diff --git a/clang/lib/Driver/ToolChains.cpp b/clang/lib/Driver/ToolChains.cpp index 2d8669b..08bd79d 100644 --- a/clang/lib/Driver/ToolChains.cpp +++ b/clang/lib/Driver/ToolChains.cpp @@ -2017,7 +2017,7 @@ static bool findBiarchMultilibs(const llvm::Triple &TargetTriple, // Determine default multilib from: 32, 64, x32 // Also handle cases such as 64 on 32, 32 on 64, etc. enum { UNKNOWN, WANT32, WANT64, WANTX32 } Want = UNKNOWN; - const bool IsX32 {TargetTriple.getEnvironment() == llvm::Triple::GNUX32}; + const bool IsX32 = TargetTriple.getEnvironment() == llvm::Triple::GNUX32; if (TargetTriple.isArch32Bit() && !NonExistent(Alt32)) Want = WANT64; else if (TargetTriple.isArch64Bit() && IsX32 && !NonExistent(Altx32)) -- 2.7.4