[lld] r185285 - [PECOFF][Writer] Fix buildbot failure on x86_64-win7.

[Rui Ueyama]

Author: ruiu
Date: Sun Jun 30 09:14:44 2013
New Revision: 185285

URL: http://llvm.org/viewvc/llvm-project?rev=185285&view=rev
Log:
[PECOFF][Writer] Fix buildbot failure on x86_64-win7.

Modified:
    lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp

Modified: lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp?rev=185285&r1=185284&r2=185285&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp (original)
+++ lld/trunk/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp Sun Jun 30 09:14:44 2013
@@ -148,10 +148,17 @@ private:
   static std::vector<uint8_t> rawContent;
 };
 
-std::vector<uint8_t> FuncAtom::rawContent = {
+// MSVC doesn't seem to like C++11 initializer list, so initialize the
+// vector from an array.
+namespace {
+uint8_t FuncAtomContent[] = {
   0xff, 0x25, 0x00, 0x00, 0x00, 0x00,  // jmp *0x0
-  0x90, 0x90,                          // nop; nop
+  0x90, 0x90                           // nop; nop
 };
+} // anonymous namespace
+
+std::vector<uint8_t> FuncAtom::rawContent(
+    FuncAtomContent, FuncAtomContent + sizeof(FuncAtomContent));
 
 class FileImportLibrary : public File {
 public: