[llvm-commits] [lld] r170983 - in /lld/trunk: include/lld/Driver/Driver.h lib/Driver/Drivers.cpp tools/lld/lld.cpp

[Andy Gibbs]

Author: andyg
Date: Sat Dec 22 03:46:10 2012
New Revision: 170983

URL: http://llvm.org/viewvc/llvm-project?rev=170983&view=rev
Log:
Fix build issue when building lld against libstdc++ 4.7

Modified:
    lld/trunk/include/lld/Driver/Driver.h
    lld/trunk/lib/Driver/Drivers.cpp
    lld/trunk/tools/lld/lld.cpp

Modified: lld/trunk/include/lld/Driver/Driver.h
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/include/lld/Driver/Driver.h?rev=170983&r1=170982&r2=170983&view=diff
==============================================================================
--- lld/trunk/include/lld/Driver/Driver.h (original)
+++ lld/trunk/include/lld/Driver/Driver.h Sat Dec 22 03:46:10 2012
@@ -48,7 +48,7 @@
   virtual ~Driver();
 
   virtual std::unique_ptr<llvm::opt::DerivedArgList>
-    transform(llvm::ArrayRef<const char *const> args) = 0;
+    transform(llvm::ArrayRef<const char *> args) = 0;
 
   /// \param flavor driver flavor to create.
   /// \param defaultTargetTriple target triple as determined by the program name

Modified: lld/trunk/lib/Driver/Drivers.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/Driver/Drivers.cpp?rev=170983&r1=170982&r2=170983&view=diff
==============================================================================
--- lld/trunk/lib/Driver/Drivers.cpp (original)
+++ lld/trunk/lib/Driver/Drivers.cpp Sat Dec 22 03:46:10 2012
@@ -89,7 +89,7 @@
   LDDriver(StringRef defaultTargetTriple) : Driver(defaultTargetTriple) {}
 
   virtual std::unique_ptr<llvm::opt::DerivedArgList>
-  transform(llvm::ArrayRef<const char *const> args) {
+  transform(llvm::ArrayRef<const char *> args) {
     assert(!_inputArgs && "transform may only be called once!");
 
     unsigned missingIndex, missingCount;

Modified: lld/trunk/tools/lld/lld.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/tools/lld/lld.cpp?rev=170983&r1=170982&r2=170983&view=diff
==============================================================================
--- lld/trunk/tools/lld/lld.cpp (original)
+++ lld/trunk/tools/lld/lld.cpp Sat Dec 22 03:46:10 2012
@@ -123,7 +123,7 @@
     // Transform to core arguments.
     driver = Driver::create(iHazAFlavor, getDefaultTarget(argc, argv));
     coreArgs = driver->transform(
-      llvm::ArrayRef<const char *const>(argv + 1, argv + argc));
+      llvm::ArrayRef<const char *>(argv + 1, argv + argc));
   }
 
   if (!coreArgs)