summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/include/makeinclude/platform_sunos5_sunc++.GNU2
2 files changed, 8 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index afc8cee9a40..31f40f39276 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Mon Jun 29 23:08:06 UTC 2009 Trevor Fields <fields_t@ociweb.com>
+
+ * include/makeinclude/platform_sunos5_sunc++.GNU:
+ Fixed settings of inline and exceptions for Sun compilers
+ greater than 5.9 (Sun Studio 12). Scan for version 5.1 was
+ catching 5.10 as well.
+
Sun Jun 28 16:15:10 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* ace/config-lite.h
diff --git a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
index 4119f0a4aa3..c0bd2c7c403 100644
--- a/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
+++ b/ACE/include/makeinclude/platform_sunos5_sunc++.GNU
@@ -107,7 +107,7 @@ ifeq (C++ 5,$(findstring C++ 5,$(CC_VERSION)))
ifeq (C++ 5.0,$(findstring C++ 5.0,$(CC_VERSION)))
inline = 0
else
- ifeq (C++ 5.1,$(findstring C++ 5.1,$(CC_VERSION)))
+ ifeq (C++ 5.1 ,$(findstring C++ 5.1 ,$(CC_VERSION)))
inline = 0
else # ! 5.1
inline ?= 1