[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2149-gc48fa9a

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  c48fa9ac1355fe7f754e7dbd6a8cdcb17a5a8c09 (commit)
       via  a9fe65c316dbfebe5b69269cf50659fe1aa5919d (commit)
      from  69982fe430aceeb05bd3c6d9686384b1d728ca8c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c48fa9ac1355fe7f754e7dbd6a8cdcb17a5a8c09
commit c48fa9ac1355fe7f754e7dbd6a8cdcb17a5a8c09
Merge: 69982fe a9fe65c
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 8 08:49:07 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Apr 8 08:49:07 2014 -0400

    Merge topic 'suppress-warning-in-comment' into next
    
    a9fe65c3 cmSystemTools: Remove unreachable return on HP compiler


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=a9fe65c316dbfebe5b69269cf50659fe1aa5919d
commit a9fe65c316dbfebe5b69269cf50659fe1aa5919d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Apr 8 08:48:08 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Apr 8 08:48:08 2014 -0400

    cmSystemTools: Remove unreachable return on HP compiler
    
    Follow up commit 1de08685 (cmSystemTools: Restore unreachable return to
    silence warnings, 2014-04-02) by excluding the unreachable return on the
    HP compiler as well as Clang.  Both recognize that it is unreachable and
    warn.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 635e31c..c27b561 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1616,7 +1616,7 @@ long copy_data(struct archive *ar, struct archive *aw)
       return (r);
       }
     }
-#if !defined(__clang__)
+#if !defined(__clang__) && !defined(__HP_aCC)
   return r; /* this should not happen but it quiets some compilers */
 #endif
 }

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

Summary of changes:
 Source/cmSystemTools.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake