[Cmake-commits] CMake branch, next, updated. v2.8.12-4248-g1b496d7

[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  1b496d75a6c8d4737f5116913bcdd56106a80a35 (commit)
       via  0fe1b15a67de0642010e37afb47b9cb27df92842 (commit)
      from  aad9908dbe2af5d7307af6b0182afd187db3a20b (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=1b496d75a6c8d4737f5116913bcdd56106a80a35
commit 1b496d75a6c8d4737f5116913bcdd56106a80a35
Merge: aad9908 0fe1b15
Author:     Stephen Kelly <steveire at gmail.com>
AuthorDate: Tue Oct 22 04:42:58 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Oct 22 04:42:58 2013 -0400

    Merge topic 'cmarray-templates' into next
    
    0fe1b15 Add MSVC6 compatibility macros.


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

    Add MSVC6 compatibility macros.

diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 1df8327..5ef3b1f 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -377,6 +377,15 @@ static thisClass* SafeDownCast(cmObject *c) \
   return 0;\
 }
 
+#if 1
+// defined(_MSC_VER) && _MSC_VER < 1300
+
+#define cmArrayBegin(a) a
+#define cmArraySize(a) (sizeof(a)/sizeof(*a))
+#define cmArrayEnd(a) a + cmArraySize(a)
+
+#else
+
 template<typename T, size_t N>
 const T* cmArrayBegin(const T (&a)[N]) { return a; }
 template<typename T, size_t N>
@@ -384,6 +393,8 @@ const T* cmArrayEnd(const T (&a)[N]) { return a + N; }
 template<typename T, size_t N>
 size_t cmArraySize(const T (&)[N]) { return N; }
 
+#endif
+
 struct cmStrCmp {
   cmStrCmp(const char *test) : m_test(test) {}
   cmStrCmp(std::string &test) : m_test(test.c_str()) {}

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

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


hooks/post-receive
-- 
CMake