[Cmake-commits] CMake branch, next, updated. v3.1.0-2232-gee01a24

[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  ee01a24ede9a83c9f72eb1fbcfb3fbb621078bfe (commit)
       via  7500f92f52b0026a0a56b80acd301e319c36024d (commit)
      from  355f9563bdbeffe6f552f5f578a6fb2a2239e9d7 (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=ee01a24ede9a83c9f72eb1fbcfb3fbb621078bfe
commit ee01a24ede9a83c9f72eb1fbcfb3fbb621078bfe
Merge: 355f956 7500f92
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 09:28:01 2015 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Jan 20 09:28:01 2015 -0500

    Merge topic 'cmake-labels-json' into next
    
    7500f92f jsoncpp: Drop doxygen comments that cause Clang warnings


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=7500f92f52b0026a0a56b80acd301e319c36024d
commit 7500f92f52b0026a0a56b80acd301e319c36024d
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Jan 20 09:26:36 2015 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Jan 20 09:27:14 2015 -0500

    jsoncpp: Drop doxygen comments that cause Clang warnings
    
    Even though we disable warnings when building jsoncpp itself, including
    its headers from other CMake sources may still cause warnings.  Update
    the code to remove these -Wdocumentation warnings.

diff --git a/Utilities/cmjsoncpp/include/json/reader.h b/Utilities/cmjsoncpp/include/json/reader.h
index 98814d5..95237d1 100644
--- a/Utilities/cmjsoncpp/include/json/reader.h
+++ b/Utilities/cmjsoncpp/include/json/reader.h
@@ -106,9 +106,7 @@ public:
    *         the parsed document. An empty string is returned if no error
    * occurred
    *         during parsing.
-   * \deprecated Use getFormattedErrorMessages() instead (typo fix).
    */
-  JSONCPP_DEPRECATED("Use getFormattedErrorMessages instead")
   std::string getFormatedErrorMessages() const;
 
   /** \brief Returns a user friendly string that list errors in the parsed
diff --git a/Utilities/cmjsoncpp/include/json/writer.h b/Utilities/cmjsoncpp/include/json/writer.h
index 397bf6a..10863b0 100644
--- a/Utilities/cmjsoncpp/include/json/writer.h
+++ b/Utilities/cmjsoncpp/include/json/writer.h
@@ -150,7 +150,6 @@ private:
  * If the Value have comments then they are outputed according to their
  #CommentPlacement.
  *
- * \param indentation Each level will be indented by this amount extra.
  * \sa Reader, Value, Value::setComment()
  */
 class JSON_API StyledStreamWriter {

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

Summary of changes:
 Utilities/cmjsoncpp/include/json/reader.h |    2 --
 Utilities/cmjsoncpp/include/json/writer.h |    1 -
 2 files changed, 3 deletions(-)


hooks/post-receive
-- 
CMake