use pragmas instead of command line arguments to disable specific warning messgaes

4 files changed, 50 insertions, 47 deletions

diff --git a/ace/config-osf1-4.0.h b/ace/config-osf1-4.0.h
index d6dcc6f1207..32a1ed81b1a 100644
--- a/ace/config-osf1-4.0.h
+++ b/ace/config-osf1-4.0.h
@@ -60,9 +60,39 @@
 #   define ACE_HAS_TEMPLATE_SPECIALIZATION
 #   define ACE_HAS_TEMPLATE_TYPEDEFS
 #   define ACE_HAS_TYPENAME_KEYWORD
+
+//    9: nested comment not allowed.  (/usr/include/pdsc.h!) (nestcomment)
+//  177: variable was declared but never referenced (declbutnotref)
+//  193: zero used for undefined preprocessing identifier (undpreid)
+//  236: controlling expression is constant (boolexprconst)
+//  401: base_class_with_nonvirtual_dtor (basclsnondto)
+//  835: unreferenced_function_param (unrfunprm)
+// 1016: expected type is incompatible with declared type of int (incint)
+// 1136: conversion to smaller size integer could lose data (intconlosbit)
+
+#   pragma message disable basclsnondto
+#   pragma message disable boolexprconst
+#   pragma message disable undpreid
+
+#   if (__DECCXX_VER >= 60190029)
+      // 6.1-029 and later support msg 1136.  Disable it because it
+      // causes warnings from ACE and/or TAO.
+#     pragma message disable intconlosbit
+#   endif /* __DECCXX_VER >= 60190029 */
+
+#   if defined (DIGITAL_UNIX)  &&  DIGITAL_UNIX == 5
+      // variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
+#     pragma message disable declbutnotref
+#   endif /* DIGITAL_UNIX 5 */
+
+#   if defined (ACE_HAS_EXCEPTIONS)
+#     pragma message disable unrfunprm
+#   endif /* ACE_HAS_EXCEPTIONS */
+
 # else  /* __DECCXX_VER < 60090010 */
 #   define ACE_LACKS_PRAGMA_ONCE
 # endif /* __DECCXX_VER < 60090010 */
+
 #elif defined (__rational__)
 # define ACE_HAS_REENTRANT_FUNCTIONS
 # define ACE_LACKS_LINEBUFFERED_STREAMBUF
diff --git a/include/makeinclude/platform_osf1_4.0.GNU b/include/makeinclude/platform_osf1_4.0.GNU
index 51cef29f007..0bef1ac4e2b 100644
--- a/include/makeinclude/platform_osf1_4.0.GNU
+++ b/include/makeinclude/platform_osf1_4.0.GNU
@@ -13,42 +13,21 @@ CXX             = $(CC)
 ####       instead, change "-pthread" to "-threads".
 CFLAGS          += -pthread
 
-ifndef CXX_VERSION
-  CXX_VERSION := $(shell $(CXX) -V)
-endif # ! CXX_VERSION
-
-CXX_1016 =
-CXX_1136 =
-
-ifneq (,$(optimize))
-  CXX_1016 = ,1016
-endif # optimize
-
-#### 6.1-029 and later support msg 1136.  We disable it by default.
-ifneq (6.0-,$(findstring 6.0-,$(CXX_VERSION)))
-ifeq (6.1-,$(findstring 6.1-,$(CXX_VERSION)))
-  ifeq (6.1-029,$(findstring 6.1-029,$(CXX_VERSION)))
-    CXX_1136 = ,1136
-  endif # 6.1-029
-else  # 6.2 or later
-  CXX_1136 = ,1136
-endif # 6.2 or later
-endif # ! 6.0
-
 #### These flags can only be used with cxx Version 6.0 and later.
 #### They are enabled by default; they can be disabled by settting
 #### 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 +=
-#  193: zero used for undefined preprocessing identifier
-#  236: controlling expression is constant
-#  401: base_class_with_nonvirtual_dtor
-#  835: unreferenced_function_param
-# 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 -msg_display_tag
-  WARNING_FLAGS += -msg_disable 193,236,401,835$(CXX_1016)$(CXX_1136)
+  WARNING_FLAGS += -w0
+  ifneq (,$(VERBOSE_WARNING))
+    WARNING_FLAGS += -msg_display_number -msg_display_tag
+  endif # VERBOSE_WARNING
+
+  ifneq (,$(optimize))
+    #### See ace/config-osf1-4.0.h for the meaning of this warning.
+    #### It's not necessary on DU 5.0.
+    WARNING_FLAGS += -msg_disable 1016
+  endif # optimize
 
   ifndef ACE_DU_VERSION
     # In case this file wasn't included by platform_osf1_cxx.GNU:
@@ -84,6 +63,10 @@ ifndef exceptions
   #### Disable the default exception handling of cxx >= 6.0.
   #### This is untested.  exceptions=1 is the default, so it's not used
   #### by default.
+  ifndef CXX_VERSION
+    CXX_VERSION := $(shell $(CXX) -V)
+  endif # ! CXX_VERSION
+
   ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
     CCFLAGS += -nocleanup
   endif # 6.x
diff --git a/include/makeinclude/platform_osf1_cxx.GNU b/include/makeinclude/platform_osf1_cxx.GNU
index 3b1c6fc7fd3..285499f3454 100644
--- a/include/makeinclude/platform_osf1_cxx.GNU
+++ b/include/makeinclude/platform_osf1_cxx.GNU
@@ -9,27 +9,22 @@ endif # ACE_DU_VERSION
 
 ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
+
 else # ! 3.x
 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
-
   CFLAGS += -DDIGITAL_UNIX=5
-
-  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
-    #### variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
-    WARNING_FLAGS += -msg_disable 177
-  endif # 6.0 or later
-
   SOFLAGS = -shared -use_ld_input $(ACELIB)
+
 endif # 5.x
 endif # ! 4.x
 endif # ! 3.x
diff --git a/include/makeinclude/platform_tru64_cxx.GNU b/include/makeinclude/platform_tru64_cxx.GNU
index 3b1c6fc7fd3..285499f3454 100644
--- a/include/makeinclude/platform_tru64_cxx.GNU
+++ b/include/makeinclude/platform_tru64_cxx.GNU
@@ -9,27 +9,22 @@ endif # ACE_DU_VERSION
 
 ifeq (3.,$(findstring 3.,$(ACE_DU_VERSION)))
   include $(ACE_ROOT)/include/makeinclude/platform_osf1_3.2.GNU
+
 else # ! 3.x
 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
-
   CFLAGS += -DDIGITAL_UNIX=5
-
-  ifeq (6.,$(findstring 6.,$(CXX_VERSION)))
-    #### variable "PTHREAD_THIS_CATCH_NP" was declared but never referenced
-    WARNING_FLAGS += -msg_disable 177
-  endif # 6.0 or later
-
   SOFLAGS = -shared -use_ld_input $(ACELIB)
+
 endif # 5.x
 endif # ! 4.x
 endif # ! 3.x