[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1740-gf4a57c3

[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  f4a57c3b949b23d5f4b798067249895cafa7b778 (commit)
       via  1de086855caa63063380387d70811e8acf1f3d05 (commit)
      from  22ba43c41644d6f7dba0c433a303750253b8fb11 (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=f4a57c3b949b23d5f4b798067249895cafa7b778
commit f4a57c3b949b23d5f4b798067249895cafa7b778
Merge: 22ba43c 1de0868
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 2 09:36:52 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Apr 2 09:36:52 2014 -0400

    Merge topic 'clang-warnings' into next
    
    1de08685 cmSystemTools: Restore unreachable return to silence warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1de086855caa63063380387d70811e8acf1f3d05
commit 1de086855caa63063380387d70811e8acf1f3d05
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Wed Apr 2 09:35:36 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Wed Apr 2 09:35:36 2014 -0400

    cmSystemTools: Restore unreachable return to silence warnings
    
    Some compilers do not recognize that the end of copy_data cannot
    be reached and complain that there is no return statement.  Clang
    warns that there is an unreachable return statement if it appears.
    Conditionally add the return statement when not building with Clang.

diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index 2f5f493..21e3874 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1662,6 +1662,9 @@ long copy_data(struct archive *ar, struct archive *aw)
       return (r);
       }
     }
+#if !defined(__clang__)
+  return r; /* this should not happen but it silences a warning */
+#endif
 }
 
 bool extract_tar(const char* outFileName, bool verbose,

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

Summary of changes:
 Source/cmSystemTools.cxx |    3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
CMake