[Cmake-commits] CMake branch, next, updated. v3.0.0-rc3-2008-g9494121

[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  9494121ac934344b625b6036b4c2fe019913d07a (commit)
       via  72e137ea7d4912099b469f6a3b0f8913a1ac5a65 (commit)
      from  9106b74f5598e01792437b529d58f9f9bd676c67 (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=9494121ac934344b625b6036b4c2fe019913d07a
commit 9494121ac934344b625b6036b4c2fe019913d07a
Merge: 9106b74 72e137e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Apr 7 10:09:28 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Apr 7 10:09:28 2014 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=72e137ea7d4912099b469f6a3b0f8913a1ac5a65
commit 72e137ea7d4912099b469f6a3b0f8913a1ac5a65
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: Mon Apr 7 10:10: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/cmCommandArgumentLexer.cxx b/Source/cmCommandArgumentLexer.cxx
index e62e53e..e23ef8a 100644
--- a/Source/cmCommandArgumentLexer.cxx
+++ b/Source/cmCommandArgumentLexer.cxx
@@ -1069,7 +1069,7 @@ case YY_STATE_EOF(NOESCAPES):
                         "fatal flex scanner internal error--no action found" );
         } /* end of action switch */
                 } /* end of scanning one token */
-return 0; /* this should not happend but it should silence a warning */
+return 0; /* this should not happen but it quiets some compilers */
 } /* end of cmCommandArgument_yylex */
 
 /* yy_get_next_buffer - try to read in a new buffer
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:


hooks/post-receive
-- 
CMake