[Cmake-commits] CMake branch, next, updated. v2.8.9-426-gaad6d5d

[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  aad6d5dde83c664ec99bcb2e4ce1594a064d0cdf (commit)
       via  110d6944ef443694cd8cb2e944dd900b577d0dc4 (commit)
      from  6a04581ca4fae9709a5c1c98adc731fe4fb26251 (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=aad6d5dde83c664ec99bcb2e4ce1594a064d0cdf
commit aad6d5dde83c664ec99bcb2e4ce1594a064d0cdf
Merge: 6a04581 110d694
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 10 08:36:03 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 10 08:36:03 2012 -0400

    Merge topic 'docbook-validate' into next
    
    110d694 docbook: Fix Sun CC warning on ptr_fun(isalnum)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=110d6944ef443694cd8cb2e944dd900b577d0dc4
commit 110d6944ef443694cd8cb2e944dd900b577d0dc4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 10 08:33:41 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Sep 10 08:33:41 2012 -0400

    docbook: Fix Sun CC warning on ptr_fun(isalnum)
    
    The Sun compiler complains:
    
     cmDocumentationFormatterDocbook.cxx", line 230: Warning (Anachronism),
     badargtype2w: Formal argument x of type int(*)(int) in call to
     std::ptr_fun<int, int>(int(*)(int)) is being passed
     extern "C" int(*)(int).
    
    Add an intermediate C++ function to forward to the C function.

diff --git a/Source/cmDocumentationFormatterDocbook.cxx b/Source/cmDocumentationFormatterDocbook.cxx
index a2ae20b..fe78005 100644
--- a/Source/cmDocumentationFormatterDocbook.cxx
+++ b/Source/cmDocumentationFormatterDocbook.cxx
@@ -13,6 +13,12 @@
 #include "cmDocumentationSection.h"
 #include <algorithm>
 #include <ctype.h> // for isalnum
+
+static bool cmIsAlnum(char c)
+{
+  return isalnum(c);
+}
+
 //----------------------------------------------------------------------------
 
 // this function is a copy of the one in the HTML formatter
@@ -224,7 +230,8 @@ void cmDocumentationFormatterDocbook::PrintFooter(std::ostream& os)
 void cmDocumentationFormatterDocbook
 ::PrintId(std::ostream& os, const char* prefix, std::string id)
 {
-  std::replace_if(id.begin(), id.end(), std::not1(std::ptr_fun(isalnum)), '_');
+  std::replace_if(id.begin(), id.end(),
+                  std::not1(std::ptr_fun(cmIsAlnum)), '_');
   if(prefix)
     {
     id = std::string(prefix) + "." + id;

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

Summary of changes:
 Source/cmDocumentationFormatterDocbook.cxx |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake