diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2015-04-11 01:32:52 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2015-04-11 01:32:52 +0000 |
| commit | d9a21bf93a07994f1564ae3941d95c667cbde448 (patch) | |
| tree | c0fcc3171d6d8f903b0df5edca57b5d276353d00 /lld/unittests/DriverTests/WinLinkDriverTest.cpp | |
| parent | 620d0ce55c5f8f797a292c7c5e01d1906bc148e5 (diff) | |
| download | bcm5719-llvm-d9a21bf93a07994f1564ae3941d95c667cbde448.tar.gz bcm5719-llvm-d9a21bf93a07994f1564ae3941d95c667cbde448.zip | |
Revert r234649 "PECOFF: Use C++11 braced init list to make Version objects."
This doesn't compile with MSVC 2013:
include\lld/ReaderWriter/PECOFFLinkingContext.h(356) : error C2797:
'lld::PECOFFLinkingContext::_imageVersion': list initialization
inside member initializer list or non-static data member initializer
is not implemented
include\lld/ReaderWriter/PECOFFLinkingContext.h(357) : error C2797:
'lld::PECOFFLinkingContext::_imageVersion': list initialization
inside member initializer list or non-static data member initializer
is not implemented
llvm-svn: 234676
Diffstat (limited to 'lld/unittests/DriverTests/WinLinkDriverTest.cpp')
| -rw-r--r-- | lld/unittests/DriverTests/WinLinkDriverTest.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lld/unittests/DriverTests/WinLinkDriverTest.cpp b/lld/unittests/DriverTests/WinLinkDriverTest.cpp index f7717f95a10..c2bc455aa81 100644 --- a/lld/unittests/DriverTests/WinLinkDriverTest.cpp +++ b/lld/unittests/DriverTests/WinLinkDriverTest.cpp @@ -45,8 +45,8 @@ TEST_F(WinLinkParserTest, Basic) { // Unspecified flags will have default values. EXPECT_FALSE(_ctx.isDll()); - EXPECT_EQ(6, _ctx.getMinOSVersion().major); - EXPECT_EQ(0, _ctx.getMinOSVersion().minor); + EXPECT_EQ(6, _ctx.getMinOSVersion().majorVersion); + EXPECT_EQ(0, _ctx.getMinOSVersion().minorVersion); EXPECT_EQ(0x400000U, _ctx.getBaseAddress()); EXPECT_EQ(1024 * 1024U, _ctx.getStackReserve()); EXPECT_EQ(4096U, _ctx.getStackCommit()); @@ -230,28 +230,28 @@ TEST_F(WinLinkParserTest, MachineUnknown) { TEST_F(WinLinkParserTest, MajorImageVersion) { EXPECT_TRUE(parse("link.exe", "/version:7", "foo.o", nullptr)); - EXPECT_EQ(7, _ctx.getImageVersion().major); - EXPECT_EQ(0, _ctx.getImageVersion().minor); + EXPECT_EQ(7, _ctx.getImageVersion().majorVersion); + EXPECT_EQ(0, _ctx.getImageVersion().minorVersion); } TEST_F(WinLinkParserTest, MajorMinorImageVersion) { EXPECT_TRUE(parse("link.exe", "/version:72.35", "foo.o", nullptr)); - EXPECT_EQ(72, _ctx.getImageVersion().major); - EXPECT_EQ(35, _ctx.getImageVersion().minor); + EXPECT_EQ(72, _ctx.getImageVersion().majorVersion); + EXPECT_EQ(35, _ctx.getImageVersion().minorVersion); } TEST_F(WinLinkParserTest, MinMajorOSVersion) { EXPECT_TRUE(parse("link.exe", "/subsystem:windows,3", "foo.o", nullptr)); EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_GUI, _ctx.getSubsystem()); - EXPECT_EQ(3, _ctx.getMinOSVersion().major); - EXPECT_EQ(0, _ctx.getMinOSVersion().minor); + EXPECT_EQ(3, _ctx.getMinOSVersion().majorVersion); + EXPECT_EQ(0, _ctx.getMinOSVersion().minorVersion); } TEST_F(WinLinkParserTest, MinMajorMinorOSVersion) { EXPECT_TRUE(parse("link.exe", "/subsystem:windows,3.1", "foo.o", nullptr)); EXPECT_EQ(llvm::COFF::IMAGE_SUBSYSTEM_WINDOWS_GUI, _ctx.getSubsystem()); - EXPECT_EQ(3, _ctx.getMinOSVersion().major); - EXPECT_EQ(1, _ctx.getMinOSVersion().minor); + EXPECT_EQ(3, _ctx.getMinOSVersion().majorVersion); + EXPECT_EQ(1, _ctx.getMinOSVersion().minorVersion); } TEST_F(WinLinkParserTest, Base) { |
