[llvm-branch-commits] [cfe-branch] r214765 - Merging r214060:

[Bill Wendling]

Author: void
Date: Mon Aug  4 14:58:38 2014
New Revision: 214765

URL: http://llvm.org/viewvc/llvm-project?rev=214765&view=rev
Log:
Merging r214060:
------------------------------------------------------------------------
r214060 | brad | 2014-07-27 18:57:32 -0700 (Sun, 27 Jul 2014) | 2 lines

Add missing override keyword to OpenBSD IsIntegratedAssemblerDefault().

------------------------------------------------------------------------

Modified:
    cfe/branches/release_35/   (props changed)
    cfe/branches/release_35/lib/Driver/ToolChains.h

Propchange: cfe/branches/release_35/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Aug  4 14:58:38 2014
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:213609,213611,213613,213741,213834,213840,213902,213912-213913,213993,213998-213999,214008,214050,214119,214208,214222,214369,214390,214471
+/cfe/trunk:213609,213611,213613,213741,213834,213840,213902,213912-213913,213993,213998-213999,214008,214050,214060,214119,214208,214222,214369,214390,214471
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_35/lib/Driver/ToolChains.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_35/lib/Driver/ToolChains.h?rev=214765&r1=214764&r2=214765&view=diff
==============================================================================
--- cfe/branches/release_35/lib/Driver/ToolChains.h (original)
+++ cfe/branches/release_35/lib/Driver/ToolChains.h Mon Aug  4 14:58:38 2014
@@ -542,7 +542,7 @@ public:
     return 2;
   }
 
-  virtual bool IsIntegratedAssemblerDefault() const {
+  virtual bool IsIntegratedAssemblerDefault() const override {
     if (getTriple().getArch() == llvm::Triple::ppc ||
         getTriple().getArch() == llvm::Triple::sparc ||
         getTriple().getArch() == llvm::Triple::sparcv9)