[PECOFF][Writer] Fix buildbot failure on x86_64-win7.
authorRui Ueyama <ruiu@google.com>
Sun, 30 Jun 2013 14:14:44 +0000 (14:14 +0000)
committerRui Ueyama <ruiu@google.com>
Sun, 30 Jun 2013 14:14:44 +0000 (14:14 +0000)
llvm-svn: 185285

lld/lib/ReaderWriter/PECOFF/ReaderImportHeader.cpp

index e494be991458af2b258f8fbd7b85758878ce3e83..7c339e58047b59c05063de10f45c8c1f8d33c2e7 100644 (file)
@@ -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: