diff options
| author | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-08 08:38:40 +0000 |
|---|---|---|
| committer | sma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2007-06-08 08:38:40 +0000 |
| commit | 95289af0460dd5909fd660a3e9edb5a994546fe7 (patch) | |
| tree | 7d6b06cebf9c23fd12082019c43d38ac9952f1bc | |
| parent | b62508c3b4b082ab9f1c225bd6db80341ceab4f9 (diff) | |
| download | ATCD-95289af0460dd5909fd660a3e9edb5a994546fe7.tar.gz | |
ChangeLogTag: Fri Jun 08 08:38:00 UTC 2007 Simon Massey <sma@prismtech.com>
| -rw-r--r-- | ACE/ChangeLog | 11 | ||||
| -rw-r--r-- | ACE/include/makeinclude/platform_hpux_aCC.GNU | 14 |
2 files changed, 22 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 7d6c1822d16..de999de3ecd 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,14 @@ +Fri Jun 08 08:38:00 UTC 2007 Simon Massey <sma@prismtech.com> + + * include/makeinclude/platform_hpux_aCC.GNU: + + Problem with Change log of "Fri May 11 07:57:55 UTC 2007" + by Johnny Willemsen <jwillemsen@remedy.nl> for + "Improved aCC version detection check". This seems to be + incorrect as the warning disable of 361 for aCC 3.xx at + line 98 is now being ignored. Suspect spelling mistake of + aC++/ANSI at line 33 + Sun Jun 3 20:05:36 UTC 2007 Olli Savia <ops@iki.fi> * ace/Capabilities.cpp: diff --git a/ACE/include/makeinclude/platform_hpux_aCC.GNU b/ACE/include/makeinclude/platform_hpux_aCC.GNU index 85bbb1bc382..e8a7c7cc22e 100644 --- a/ACE/include/makeinclude/platform_hpux_aCC.GNU +++ b/ACE/include/makeinclude/platform_hpux_aCC.GNU @@ -30,12 +30,20 @@ CXX = aCC # Determine compiler version CXXVERS_WORDS := $(subst ., , $(shell $(CXX) -V 2>&1)) CXXINFO := $(word 3, $(CXXVERS_WORDS)) -ifeq (aC++/ANSI, $(CXXINFO)) +# aCC++ 3.67 gives "aCC: HP ANSI C++ B3910B A.03.67" +# aCC++ 3.73 gives "aCC: HP ANSI C++ B3910B A.03.73" +# +ifeq (ANSI, $(CXXINFO)) CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) else - CXXMINORVERS := $(word 7, $(CXXVERS_WORDS)) - CXXMAJORVERS := $(word 6, $(CXXVERS_WORDS)) + ifeq (aC++/ANSI, $(CXXINFO)) + CXXMINORVERS := $(word 8, $(CXXVERS_WORDS)) + CXXMAJORVERS := $(word 7, $(CXXVERS_WORDS)) + else + CXXMINORVERS := $(word 7, $(CXXVERS_WORDS)) + CXXMAJORVERS := $(word 6, $(CXXVERS_WORDS)) + endif endif ifeq (1,$(stdcpplib)) |