summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-10-26 14:27:56 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-10-26 14:27:56 (GMT)
commit564cf169e6edfe54ee3b558cf86c2a15936430d3 (patch)
tree8b13ae034273e7a3f29ecfd37ca2869e01623aa5 /Source
parent0c46e55656aa01918026290ef59fbeed96e43d16 (diff)
parentdfe0c2168b4d3cca65444d7d0209dbd631525bd9 (diff)
downloadCMake-564cf169e6edfe54ee3b558cf86c2a15936430d3.zip
CMake-564cf169e6edfe54ee3b558cf86c2a15936430d3.tar.gz
CMake-564cf169e6edfe54ee3b558cf86c2a15936430d3.tar.bz2
Merge topic 'cmarray-templates'
dfe0c21 cmArray: Use macro variant of cmArray{Begin,Size,End} for old GCC.
Diffstat (limited to 'Source')
-rw-r--r--Source/cmStandardIncludes.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmStandardIncludes.h b/Source/cmStandardIncludes.h
index 6c77144..18d017d 100644
--- a/Source/cmStandardIncludes.h
+++ b/Source/cmStandardIncludes.h
@@ -377,7 +377,8 @@ static thisClass* SafeDownCast(cmObject *c) \
return 0;\
}
-#if defined(_MSC_VER) && _MSC_VER < 1300
+#if defined(_MSC_VER) && _MSC_VER < 1300 \
+ || defined(__GNUC__) && __GNUC__ < 3
#define cmArrayBegin(a) a
#define cmArraySize(a) (sizeof(a)/sizeof(*a))