ChangeLogTag: Fri Oct 29 07:08:16 1999 David L. Levine <levine@cs.wustl.edu>

6 files changed, 42 insertions, 31 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index adc7ec0be9b..ef3cf884400 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,7 +1,14 @@
+Fri Oct 29 07:08:16 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * include/makeinclude/rules.local.GNU,
+          include/makeinclude/wrapper_macros.GNU
+          include/makeinclude/platform_vxworks5.x_g++.GNU:
+          fixed typo:  COMSPEC instead of COMPSPEC.
+
 Thu Oct 28 11:15:43 1999  Nanbor Wang  <nanbor@ace.cs.wustl.edu>
 
-	* docs/ACE-guidelines.html: Added a new guideline on avoiding
-	  multicharacter format specifiers in ACE_DEBUG/ACE_ERROR.
+        * docs/ACE-guidelines.html: Added a new guideline on avoiding
+          multicharacter format specifiers in ACE_DEBUG/ACE_ERROR.
 
 Thu Oct 28 10:54:42 1999  Nanbor Wang  <nanbor@ace.cs.wustl.edu>
 
diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 97c795ce3a4..2c5187b13a1 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,29 +1,33 @@
+Fri Oct 29 07:08:16 1999  David L. Levine  <levine@cs.wustl.edu>
+
+        * rules.tao.GNU: fixed typo:  COMSPEC instead of COMPSPEC.
+
 Thu Oct 28 16:32:33 1999  Jeff Parsons  <parsons@cs.wustl.edu>
 
-	* tao/Typecode.h:
-	* tao/Typecode.i:
-	* tao/Typecode.cpp:
-	  Changes to equal() and equivalent() and the functions underneath
-	  them to conform to CORBA 2.3.1 (99-10-07). The old version 
-	  of equivalent() just unaliased both typcodes and then called
-	  equal(). This behavior will not satisfy 2.3 rules, so now the two
-	  functions call a new one call equ_common() with an extra arg,
-	  a flag called equiv_only, set in equivalent()'s call but not in
-	  equal()'s. This new function unaliases the typecodes if the flag
-	  is set, then calls private_equal(), which passes the call on to
-	  the appropriate private_equal_* function, all of which now 
-	  have the extra arg. Equ_common() is also now the recursion
-	  entry point for complex typecode checking.
-
-	* TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
-	* TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
-	* TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
-	* TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
-	* TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
-	* TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
-	* TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
-	   Changed code generation to use equivalent() instead
-	   of equal() in the Any extraction operator.
+        * tao/Typecode.h:
+        * tao/Typecode.i:
+        * tao/Typecode.cpp:
+          Changes to equal() and equivalent() and the functions underneath
+          them to conform to CORBA 2.3.1 (99-10-07). The old version
+          of equivalent() just unaliased both typcodes and then called
+          equal(). This behavior will not satisfy 2.3 rules, so now the two
+          functions call a new one call equ_common() with an extra arg,
+          a flag called equiv_only, set in equivalent()'s call but not in
+          equal()'s. This new function unaliases the typecodes if the flag
+          is set, then calls private_equal(), which passes the call on to
+          the appropriate private_equal_* function, all of which now
+          have the extra arg. Equ_common() is also now the recursion
+          entry point for complex typecode checking.
+
+        * TAO_IDL/be/be_visitor_array/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_enum/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_exception/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_interface/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_sequence/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_structure/any_op_cs.cpp:
+        * TAO_IDL/be/be_visitor_union/any_op_cs.cpp:
+           Changed code generation to use equivalent() instead
+           of equal() in the Any extraction operator.
 
 Thu Oct 28 14:24:39 1999  David L. Levine  <levine@cs.wustl.edu>
 
diff --git a/TAO/rules.tao.GNU b/TAO/rules.tao.GNU
index eec27befe8b..88a1a98416c 100644
--- a/TAO/rules.tao.GNU
+++ b/TAO/rules.tao.GNU
@@ -20,7 +20,7 @@ endif
 ifndef COMSPEC
   ifdef ComSpec
     #### ACE+TAO use COMSPEC, but ComSpec is defined.
-    COMPSPEC = $(ComSpec)
+    COMSPEC = $(ComSpec)
   endif # ComSpec
 endif # ! COMPSPEC
 
@@ -111,7 +111,7 @@ CPPFLAGS += \
 #### Build rules.
 ####
 ifndef COMSPEC
-  #### Assume we're not on a WIN32 host.
+  #### Assume we're on a WIN32 host.
   ifneq (1,$(VXWORKS))
     #### These don't work on NT host for Tornado II.
     IDL_EXT=C.h C.i C.cpp S.h S.i S.cpp S_T.h S_T.i S_T.cpp
diff --git a/include/makeinclude/platform_vxworks5.x_g++.GNU b/include/makeinclude/platform_vxworks5.x_g++.GNU
index a41ba8402c2..904ca66b069 100644
--- a/include/makeinclude/platform_vxworks5.x_g++.GNU
+++ b/include/makeinclude/platform_vxworks5.x_g++.GNU
@@ -175,7 +175,7 @@ ifndef ACE_CC
   ifndef COMSPEC
     ifdef ComSpec
       #### ACE+TAO use COMSPEC, but ComSpec is defined.
-      COMPSPEC = $(ComSpec)
+      COMSPEC = $(ComSpec)
     endif # ComSpec
   endif # ! COMPSPEC
 
diff --git a/include/makeinclude/rules.local.GNU b/include/makeinclude/rules.local.GNU
index c40ebb8e93f..66094f4aae7 100644
--- a/include/makeinclude/rules.local.GNU
+++ b/include/makeinclude/rules.local.GNU
@@ -128,7 +128,7 @@ ifeq (,$(LN_S))
   ifndef COMSPEC
     ifdef ComSpec
       #### ACE+TAO use COMSPEC, but ComSpec is defined.
-      COMPSPEC = $(ComSpec)
+      COMSPEC = $(ComSpec)
     endif # ComSpec
   endif # ! COMPSPEC
 
diff --git a/include/makeinclude/wrapper_macros.GNU b/include/makeinclude/wrapper_macros.GNU
index 11ffb3520ed..b7fdf31f5a7 100644
--- a/include/makeinclude/wrapper_macros.GNU
+++ b/include/makeinclude/wrapper_macros.GNU
@@ -172,7 +172,7 @@ LEX             = flex
 ifndef COMSPEC
   ifdef ComSpec
     #### ACE+TAO use COMSPEC, but ComSpec is defined.
-    COMPSPEC = $(ComSpec)
+    COMSPEC = $(ComSpec)
   endif # ComSpec
 endif # ! COMPSPEC