summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-19 03:02:42 +0000
committerlevine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1999-05-19 03:02:42 +0000
commit3e5d013a09c2b03fe82ab52f611dd3cfc637d2b3 (patch)
tree4b4dce908fd450bc1aa04c5138357a193d431d47
parent0db95229fa445f25c39f8f3e6234dba9d2a722f3 (diff)
downloadATCD-3e5d013a09c2b03fe82ab52f611dd3cfc637d2b3.tar.gz
removed suppression of warning 9 (nested comment not allowed) on Digital Unix 5.0 and later
-rw-r--r--include/makeinclude/platform_osf1_4.0.GNU11
-rw-r--r--include/makeinclude/platform_osf1_cxx.GNU4
-rw-r--r--include/makeinclude/platform_tru64_cxx.GNU4
3 files changed, 16 insertions, 3 deletions
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index 75e6603564d..5e66ad9d172 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -40,7 +40,6 @@ endif # ! 6.0
#### CXX_VER to CXX_5 either on the make command line, or by
#### or by setting the CXX_VER environment variable to CXX_5.
# WARNING_FLAGS +=
-# 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
# 174: expr_has_no_effect
# 193: zero used for undefined preprocessing identifier
# 236: controlling expression is constant
@@ -51,9 +50,15 @@ endif # ! 6.0
# 1016: expected type is incompatible with declared type of int (in bzero ())
# 1136: conversion to integral type of smaller size could lose data
ifneq ($(CXX_VER),CXX_5)
- WARNING_FLAGS += -w0 -msg_display_number
+ WARNING_FLAGS += -w0 -msg_display_number -msg_display_tag
WARNING_FLAGS += \
- -msg_disable 9,174,193,236,401,610,835,839$(CXX_1016)$(CXX_1136)
+ -msg_disable 174,193,236,401,610,835,839$(CXX_1016)$(CXX_1136)
+
+ ifndef ACE_DU_VERSION
+ # In case this file wasn't included by platform_osf1_cxx.GNU:
+ # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
+ WARNING_FLAGS += -msg_disable 9
+ endif # ACE_DU_VERSION
endif # 6.0 or later
CCFLAGS += $(CFLAGS) -ptr ptrepository $(WARNING_FLAGS)
diff --git a/include/makeinclude/platform_osf1_cxx.GNU b/include/makeinclude/platform_osf1_cxx.GNU
index a7657897e08..3b1c6fc7fd3 100644
--- a/include/makeinclude/platform_osf1_cxx.GNU
+++ b/include/makeinclude/platform_osf1_cxx.GNU
@@ -14,6 +14,10 @@ ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
CFLAGS += -DDIGITAL_UNIX=4
+ ifneq ($(CXX_VER),CXX_5)
+ # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
+ WARNING_FLAGS += -msg_disable 9
+ endif # 6.0 or later
else # ! 4.x
ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
index a7657897e08..3b1c6fc7fd3 100644
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ b/include/makeinclude/platform_tru64_cxx.GNU
@@ -14,6 +14,10 @@ ifeq (4.,$(findstring 4.,$(ACE_DU_VERSION)))
include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU
CFLAGS += -DDIGITAL_UNIX=4
+ ifneq ($(CXX_VER),CXX_5)
+ # 9: nested comment not allowed. But there's one in /usr/include/pdsc.h!
+ WARNING_FLAGS += -msg_disable 9
+ endif # 6.0 or later
else # ! 4.x
ifeq (5.,$(findstring 5.,$(ACE_DU_VERSION)))
include $(ACE_ROOT)/include/makeinclude/platform_osf1_4.0.GNU