summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-03-10 22:54:56 +0000
committerSteve Huston <shuston@riverace.com>2007-03-10 22:54:56 +0000
commit5e5d75389740a107662a31c01ebabac6e06c4681 (patch)
treef96a808c6175eb88dcd50566a160f013044f0546
parentbbf0642364d551a9bcbf4244236517ba144eaed7 (diff)
downloadATCD-5e5d75389740a107662a31c01ebabac6e06c4681.tar.gz
ChangeLogTag:Sat Mar 10 22:49:01 UTC 2007 Steve Huston <shuston@riverace.com>
-rw-r--r--TAO/ChangeLog11
-rw-r--r--TAO/MPC/config/tao_vc8warnings.mpb14
-rw-r--r--TAO/MPC/config/taodefaults.mpb2
-rw-r--r--TAO/TAO_IDL/tao_idl.mpc2
4 files changed, 27 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index aa8491e857d..02b3cc75025 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,14 @@
+Sat Mar 10 22:49:01 UTC 2007 Steve Huston <shuston@riverace.com>
+
+ * MPC/config/tao_vc8warnings.mpb: New base containing features that
+ turn VC8 warnings on/off. Some of these may benefit from some looking
+ at; if you want to see them, regenerate projects with the feature
+ turned off.
+
+ * MPC/config/taodefaults.mpb:
+ * TAO_IDL/tao_idl.mpc: Inherit from tao_vc8warnings.mpb to
+ shut off the VC8 warnings.
+
Fri Mar 9 13:47:52 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/DiffServ/client.cpp:
diff --git a/TAO/MPC/config/tao_vc8warnings.mpb b/TAO/MPC/config/tao_vc8warnings.mpb
new file mode 100644
index 00000000000..f2d47d51d2b
--- /dev/null
+++ b/TAO/MPC/config/tao_vc8warnings.mpb
@@ -0,0 +1,14 @@
+// -*- MPC -*-
+// $Id$
+
+// This file contains optional features that disable VC8 warnings that were
+// not present in earlier versions. Some people may consider these superfluous
+// or have already checked code to be sure it causes no trouble. So these
+// warnings are disabled by default. To enable them, generate your projects
+// with the feature set to 0.
+
+feature(vc8_avoid_dominance_warnings) {
+ specific(vc8) {
+ DisableSpecificWarnings += 4250
+ }
+}
diff --git a/TAO/MPC/config/taodefaults.mpb b/TAO/MPC/config/taodefaults.mpb
index 481150f68c2..bdfac6286fc 100644
--- a/TAO/MPC/config/taodefaults.mpb
+++ b/TAO/MPC/config/taodefaults.mpb
@@ -1,7 +1,7 @@
// -*- MPC -*-
// $Id$
-project : exceptions {
+project : exceptions, tao_vc8warnings {
staticflags += TAO_AS_STATIC_LIBS
includes += $(TAO_ROOT)
libpaths += $(ACE_ROOT)/lib
diff --git a/TAO/TAO_IDL/tao_idl.mpc b/TAO/TAO_IDL/tao_idl.mpc
index 5af3fb1eb94..ad32450cd3c 100644
--- a/TAO/TAO_IDL/tao_idl.mpc
+++ b/TAO/TAO_IDL/tao_idl.mpc
@@ -46,7 +46,7 @@ project(TAO_IDL_EXE) : aceexe, install, tao_output, crosscompile {
}
-project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile {
+project(TAO_IDL_BE) : acelib, conv_lib, tao_output, crosscompile, tao_vc8warnings {
sharedname = TAO_IDL_BE
libs += TAO_IDL_FE
dynamicflags = TAO_IDL_BE_BUILD_DLL