[lld] r210704 - Quick fix for the windows build.

[Rafael Espindola]

Author: rafael
Date: Wed Jun 11 16:04:06 2014
New Revision: 210704

URL: http://llvm.org/viewvc/llvm-project?rev=210704&view=rev
Log:
Quick fix for the windows build.

We have to look for both std::make_error_code as well as our overloads.

Modified:
    lld/trunk/include/lld/Driver/CoreInputGraph.h
    lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h

Modified: lld/trunk/include/lld/Driver/CoreInputGraph.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/CoreInputGraph.h?rev=210704&r1=210703&r2=210704&view=diff
==============================================================================
--- lld/trunk/include/lld/Driver/CoreInputGraph.h (original)
+++ lld/trunk/include/lld/Driver/CoreInputGraph.h Wed Jun 11 16:04:06 2014
@@ -33,6 +33,7 @@ public:
 
   /// \brief Parse the input file to lld::File.
   error_code parse(const LinkingContext &ctx, raw_ostream &diagnostics) override {
+    using std::make_error_code;
     ErrorOr<StringRef> filePath = getPath(ctx);
     if (filePath.getError() == std::errc::no_such_file_or_directory)
       return make_error_code(std::errc::no_such_file_or_directory);

Modified: lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h?rev=210704&r1=210703&r2=210704&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h (original)
+++ lld/trunk/lib/ReaderWriter/ELF/DefaultLayout.h Wed Jun 11 16:04:06 2014
@@ -541,6 +541,7 @@ AtomSection<ELFT> *DefaultLayout<ELFT>::
 
 template <class ELFT>
 ErrorOr<const lld::AtomLayout &> DefaultLayout<ELFT>::addAtom(const Atom *atom) {
+  using std::make_error_code;
   if (const DefinedAtom *definedAtom = dyn_cast<DefinedAtom>(atom)) {
     // HACK: Ignore undefined atoms. We need to adjust the interface so that
     // undefined atoms can still be included in the output symbol table for