[Cmake-commits] CMake branch, next, updated. v2.8.9-430-gca055db

[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  ca055dbab1cb48de5decc3d5a05a046299596bc0 (commit)
       via  d0c863f60f55d618f6b1c5dcdae0b8b3acff1f35 (commit)
      from  4b87304fe253512fc4a0cdd4296600d5cd9f2cac (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=ca055dbab1cb48de5decc3d5a05a046299596bc0
commit ca055dbab1cb48de5decc3d5a05a046299596bc0
Merge: 4b87304 d0c863f
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Sep 10 09:41:49 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 10 09:41:49 2012 -0400

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


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0c863f60f55d618f6b1c5dcdae0b8b3acff1f35
commit d0c863f60f55d618f6b1c5dcdae0b8b3acff1f35
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 09:41:37 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..706ce0a 100644
--- a/Source/cmDocumentationFormatterDocbook.cxx
+++ b/Source/cmDocumentationFormatterDocbook.cxx
@@ -13,6 +13,12 @@
 #include "cmDocumentationSection.h"
 #include <algorithm>
 #include <ctype.h> // for isalnum
+
+static int cmIsAlnum(int 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:


hooks/post-receive
-- 
CMake