[Cmake-commits] CMake branch, next, updated. v2.8.11-2129-g4b4e553

[Rolf Eike Beer]

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  4b4e553181e238964ec15ad74a0f43f99ee93160 (commit)
       via  1a2a6ba4b68dc59b8f5cae26458cc79ad3bb2750 (commit)
      from  85d8dccd9bfbed940ac4c209b4c55194f6df2bf3 (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=4b4e553181e238964ec15ad74a0f43f99ee93160
commit 4b4e553181e238964ec15ad74a0f43f99ee93160
Merge: 85d8dcc 1a2a6ba
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue May 21 17:01:29 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue May 21 17:01:29 2013 -0400

    Merge topic 'Memchecker-AIX-fix' into next
    
    1a2a6ba Tests: fix build of dummy memtester on AIX


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1a2a6ba4b68dc59b8f5cae26458cc79ad3bb2750
commit 1a2a6ba4b68dc59b8f5cae26458cc79ad3bb2750
Author:     Rolf Eike Beer <eike at sf-mail.de>
AuthorDate: Tue May 21 22:58:36 2013 +0200
Commit:     Rolf Eike Beer <eike at sf-mail.de>
CommitDate: Tue May 21 22:58:36 2013 +0200

    Tests: fix build of dummy memtester on AIX
    
    Both <string> and <cmSystemTools.h> include <stdio.h> one or the other way. It
    looks like the CMake header adds a define that will cause another part of the
    system header to be used, resulting in conflicting definitions.

diff --git a/Tests/CTestTestMemcheck/memtester.cxx.in b/Tests/CTestTestMemcheck/memtester.cxx.in
index 4609fa3..da6f5a4 100644
--- a/Tests/CTestTestMemcheck/memtester.cxx.in
+++ b/Tests/CTestTestMemcheck/memtester.cxx.in
@@ -1,5 +1,5 @@
-#include <string>
 #include <cmSystemTools.h>
+#include <string>
 
 #define RETVAL @_retval@
 

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

Summary of changes:
 Tests/CTestTestMemcheck/memtester.cxx.in |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake