[lld] r268185 - Further MSVC appeasement.

[Peter Collingbourne via llvm-commits]

Author: pcc
Date: Sun May  1 00:39:02 2016
New Revision: 268185

URL: http://llvm.org/viewvc/llvm-project?rev=268185&view=rev
Log:
Further MSVC appeasement.

Modified:
    lld/trunk/ELF/Symbols.h
    lld/trunk/ELF/Writer.cpp

Modified: lld/trunk/ELF/Symbols.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Symbols.h?rev=268185&r1=268184&r2=268185&view=diff
==============================================================================
--- lld/trunk/ELF/Symbols.h (original)
+++ lld/trunk/ELF/Symbols.h Sun May  1 00:39:02 2016
@@ -435,8 +435,8 @@ void replaceBody(Symbol *S, ArgT &&... A
   static_assert(llvm::AlignOf<T>::Alignment <=
                     llvm::AlignOf<decltype(S->Body)>::Alignment,
                 "Body not aligned enough");
-  static_assert(static_cast<SymbolBody *>(static_cast<T *>(nullptr)) == nullptr,
-                "Not a SymbolBody");
+  assert(static_cast<SymbolBody *>(static_cast<T *>(nullptr)) == nullptr &&
+         "Not a SymbolBody");
   new (S->Body.buffer) T(std::forward<ArgT>(Arg)...);
 }
 

Modified: lld/trunk/ELF/Writer.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/ELF/Writer.cpp?rev=268185&r1=268184&r2=268185&view=diff
==============================================================================
--- lld/trunk/ELF/Writer.cpp (original)
+++ lld/trunk/ELF/Writer.cpp Sun May  1 00:39:02 2016
@@ -1487,11 +1487,11 @@ template <class ELFT> void Writer<ELFT>:
   auto Define = [&](StringRef Start, StringRef End,
                     OutputSectionBase<ELFT> *OS) {
     if (OS) {
-      Symtab.addSynthetic(Start, *OS, 0);
-      Symtab.addSynthetic(End, *OS, DefinedSynthetic<ELFT>::SectionEnd);
+      this->Symtab.addSynthetic(Start, *OS, 0);
+      this->Symtab.addSynthetic(End, *OS, DefinedSynthetic<ELFT>::SectionEnd);
     } else {
-      Symtab.addIgnored(Start);
-      Symtab.addIgnored(End);
+      this->Symtab.addIgnored(Start);
+      this->Symtab.addIgnored(End);
     }
   };