[Cmake-commits] CMake branch, next, updated. v2.8.12-4254-g9b346b4

[Stephen Kelly]

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  9b346b416066fea2770c0df2a6aedff941ff49bd (commit)
       via  b00dae81ab993fa7f655c032228c7020e81277cb (commit)
      from  7eee6d4893605718e2f22214613e07f1f3098dfb (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=9b346b416066fea2770c0df2a6aedff941ff49bd
commit 9b346b416066fea2770c0df2a6aedff941ff49bd
Merge: 7eee6d4 b00dae8
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 04:45:10 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 22 04:45:10 2013 -0400

    Merge topic 'cmarray-templates' into next
    
    b00dae8 Fix macro test.


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b00dae81ab993fa7f655c032228c7020e81277cb
commit b00dae81ab993fa7f655c032228c7020e81277cb
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 10:44:50 2013 +0200
Commit:     Stephen Kelly <steveire at gmail.com>
CommitDate: Tue Oct 22 10:44:50 2013 +0200

    Fix macro test.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 5ef3b1f..6c77144 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -377,8 +377,7 @@ static thisClass* SafeDownCast(cmObject *c) \
   return 0;\
 }
 
-#if 1
-// defined(_MSC_VER) && _MSC_VER < 1300
+#if defined(_MSC_VER) && _MSC_VER < 1300
 
 #define cmArrayBegin(a) a
 #define cmArraySize(a) (sizeof(a)/sizeof(*a))

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

Summary of changes:
 Source/cmStandardIncludes.h |    3 +--
 1 files changed, 1 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake