[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-1901-g7f1dcd3

[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  7f1dcd387f6af3d689dc5f750fc3c3fdf9ebedda (commit)
       via  9cec2360377ed9fa2d390b58ace1e1b1567bad66 (commit)
      from  3196af5221d861ac52dc0d50fcb8654c42035544 (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=7f1dcd387f6af3d689dc5f750fc3c3fdf9ebedda
commit 7f1dcd387f6af3d689dc5f750fc3c3fdf9ebedda
Merge: 3196af5 9cec236
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 4 11:47:31 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Apr 4 11:47:31 2014 -0400

    Merge topic 'suppress-warning-in-comment' into next
    
    9cec2360 Re-word comment on unreachable return statements


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9cec2360377ed9fa2d390b58ace1e1b1567bad66
commit 9cec2360377ed9fa2d390b58ace1e1b1567bad66
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Apr 4 11:47:04 2014 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Apr 4 11:47:04 2014 -0400

    Re-word comment on unreachable return statements
    
    Do not use the word "warning" in the comment because CTest launchers
    match it and CTestCustom.cmake.in does not suppress it.

diff --git a/Source/cmDependsJavaLexer.cxx b/Source/cmDependsJavaLexer.cxx
index 1e505a5..f7676d9 100644
--- a/Source/cmDependsJavaLexer.cxx
+++ b/Source/cmDependsJavaLexer.cxx
@@ -1591,7 +1591,7 @@ case YY_STATE_EOF(string):
       "fatal flex scanner internal error--no action found" );
   } /* end of action switch */
     } /* end of scanning one token */
-return 0; /* this should not happen but it silences a warning*/
+return 0; /* this should not happen but it quiets some compilers */
 } /* end of cmDependsJava_yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
diff --git a/Source/cmExprLexer.cxx b/Source/cmExprLexer.cxx
index aa384cd..4704f03 100644
--- a/Source/cmExprLexer.cxx
+++ b/Source/cmExprLexer.cxx
@@ -976,7 +976,7 @@ case YY_STATE_EOF(INITIAL):
       "fatal flex scanner internal error--no action found" );
   } /* end of action switch */
     } /* end of scanning one token */
-return 0; /* this should not happen but it silences a warning*/
+return 0; /* this should not happen but it quiets some compilers */
 } /* end of cmExpr_yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
diff --git a/Source/cmSystemTools.cxx b/Source/cmSystemTools.cxx
index c1c33f2..635e31c 100644
--- a/Source/cmSystemTools.cxx
+++ b/Source/cmSystemTools.cxx
@@ -1617,7 +1617,7 @@ long copy_data(struct archive *ar, struct archive *aw)
       }
     }
 #if !defined(__clang__)
-  return r; /* this should not happen but it silences a warning */
+  return r; /* this should not happen but it quiets some compilers */
 #endif
 }
 

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

Summary of changes:
 Source/cmDependsJavaLexer.cxx |    2 +-
 Source/cmExprLexer.cxx        |    2 +-
 Source/cmSystemTools.cxx      |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake