ChangeLogTag: Thu Aug 19 10:04:12 1999 David L. Levine <levine@cs.wustl.edu>

2 files changed, 37 insertions, 18 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 035212d247d..979ae43a03f 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,18 +1,29 @@
+Thu Aug 19 10:04:12 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * include/makeinclude/platform_vxworks5.x_g++.GNU: added
+          trap to cause builds to fail if the exceptions flag is
+          enabled.  The VxWorks libraries don't support exceptions.
+          And, exceptions give the (Tornado II) compiler fits, e.g.,
+          with ACE_wrappers/TAO/tao/IORManipulation.cpp.  Thanks to
+          Erik Johannes <ejohannes@oresis.com> for this nifty preemptive
+          solution, and to Nick Sawadsky <Nick_Sawadsky@BrooksSoftware.com>
+          for motivating its implementation.
+
 Thu Aug 19 09:34:41 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
-	* ace/Service_Config: Updated the failure result comment for
-	  open() and cleaned up the return value and errno propagation for
- 	  open_i() when process_commandline_directives() fails.  Thanks to
- 	  Jerry D. De Master <jdemaste@ipdinc.com> for reporting the bug
- 	  and suggesting a fix.
-
-	* ace/Service_Config.h: Moved the process_directives() method
-	  used to parse the svc.conf files out of the protected part of
- 	  the class to the public part so that application programmers can
- 	  call this directly to reconfigure services from the svc.conf
- 	  files.  Thanks to John Mink <John.Mink@nl.origin-it.com> for
-	  suggesting this.
-	
+        * ace/Service_Config: Updated the failure result comment for
+          open() and cleaned up the return value and errno propagation for
+          open_i() when process_commandline_directives() fails.  Thanks to
+          Jerry D. De Master <jdemaste@ipdinc.com> for reporting the bug
+          and suggesting a fix.
+
+        * ace/Service_Config.h: Moved the process_directives() method
+          used to parse the svc.conf files out of the protected part of
+          the class to the public part so that application programmers can
+          call this directly to reconfigure services from the svc.conf
+          files.  Thanks to John Mink <John.Mink@nl.origin-it.com> for
+          suggesting this.
+
 Wed Aug 18 22:45:24 1999  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
 
         * ace/WFMO_Reactor.h,
@@ -37,13 +48,13 @@ Wed Aug 18 22:45:24 1999  Douglas C. Schmidt  <schmidt@mambo.cs.wustl.edu>
         * ace/Timer_Heap_T.cpp:
         * ace/Timer_List_T.cpp:
         * ace/Timer_Wheel_T.cpp:
-	  Changed all uses of const long to long...
+          Changed all uses of const long to long...
 
 Wed Aug 18 22:15:58 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
 
-	* tests/run_tests.sh:
-	  It was running the DISABLED tests, thanks to David for pointing
-	  this out.
+        * tests/run_tests.sh:
+          It was running the DISABLED tests, thanks to David for pointing
+          this out.
 
 Wed Aug 18 21:48:52 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index 19ae0009f96..76c8d81df2f 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -188,8 +188,9 @@ endif # ! ACE_CC_VERSION
 ifeq (egcs,$(findstring egcs,$(ACE_CC_VERSION)))
   ACE_HAS_GNUG_PRE_2_8 := 0
   CFLAGS += -DACE_VXWORKS=0x540
-  ifndef exceptions
+  ifneq (1,$(exceptions))
     #### With exceptions, this is applied in wrapper_macros.GNU.
+    #### Without, we do it here.
     CFLAGS += -Wno-uninitialized
   endif # ! exceptions
 endif # egcs
@@ -206,3 +207,10 @@ LINK.cc.override = $(LD)
 #### To extract the symbol table from each executable, uncomment the POSTLINK
 #### definition below.
 ## POSTLINK         = ; VX_CPU_FAMILY=$(TOOLENV) $(BINXSYM_NAME) < $@ > $@.sym
+
+ifeq (1,$(exceptions))
+  #### The VxWorks libraries don't support exceptions.  And, exceptions
+  #### give the (Tornado II) compiler fits, e.g., with
+  #### ACE_wrappers/TAO/tao/IORManipulation.cpp.
+  CONFIGURATION_ERROR: exception_handling_is_not_supported_on_VxWorks!
+endif # exceptions