ChangeLogTag:Fri May 21 09:20:10 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

3 files changed, 31 insertions, 19 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index 848be4211f9..78f01466222 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,14 @@
+Fri May 21 09:20:10 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* tao/GIOP.cpp:
+	  Changed character literals in the GIOP magic number to numeric
+	  constants, otherwise it does not work in EBCDIC (or machines
+	  that are not ASCII for that matter).  Thanks to Jim Rogers
+	  <jrogers@viasoft.com> for pointing out this problem.
+
+	* orbsvcs/tests/Property/Makefile:
+	  Updated dependencies
+
 Fri May 21 09:31:32 EDT 1999  Aniruddha Gokhale  <gokhale@sahyadri.research.bell-labs.com>
 
 	* orbsvcs/orbsvcs/Makefile: ran "make depend".
diff --git a/TAO/orbsvcs/tests/Property/Makefile b/TAO/orbsvcs/tests/Property/Makefile
index be7b5169156..2186d9f72b0 100644
--- a/TAO/orbsvcs/tests/Property/Makefile
+++ b/TAO/orbsvcs/tests/Property/Makefile
@@ -67,17 +67,15 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/Malloc.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Malloc.i \
  $(ACE_ROOT)/ace/Malloc_T.h \
  $(ACE_ROOT)/ace/Synch.h \
@@ -119,6 +117,8 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/Message_Block_T.h \
  $(ACE_ROOT)/ace/Message_Block_T.i \
  $(ACE_ROOT)/ace/Message_Block_T.cpp \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/CDR_Stream.i \
  $(TAO_ROOT)/tao/try_macros.h \
  $(TAO_ROOT)/tao/orbconf.h \
@@ -343,8 +343,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
@@ -367,15 +365,12 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/streams.h \
  $(ACE_ROOT)/ace/Basic_Types.h \
  $(ACE_ROOT)/ace/Basic_Types.i \
- $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Trace.h \
+ $(ACE_ROOT)/ace/OS.i \
  $(ACE_ROOT)/ace/Log_Msg.h \
  $(ACE_ROOT)/ace/Log_Record.h \
  $(ACE_ROOT)/ace/ACE.i \
  $(ACE_ROOT)/ace/Log_Priority.h \
- $(ACE_ROOT)/ace/SString.h \
- $(ACE_ROOT)/ace/SString.i \
- $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Log_Record.i \
  $(ACE_ROOT)/ace/SV_Semaphore_Complex.h \
  $(ACE_ROOT)/ace/SV_Semaphore_Simple.h \
@@ -397,6 +392,7 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/Service_Object.i \
  $(ACE_ROOT)/ace/Thread_Manager.h \
  $(ACE_ROOT)/ace/Containers.h \
+ $(ACE_ROOT)/ace/Malloc_Base.h \
  $(ACE_ROOT)/ace/Containers.i \
  $(ACE_ROOT)/ace/Containers_T.h \
  $(ACE_ROOT)/ace/Containers_T.i \
@@ -436,6 +432,8 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(ACE_ROOT)/ace/Strategies.h \
  $(ACE_ROOT)/ace/Strategies_T.h \
  $(ACE_ROOT)/ace/Service_Config.h \
+ $(ACE_ROOT)/ace/SString.h \
+ $(ACE_ROOT)/ace/SString.i \
  $(ACE_ROOT)/ace/Service_Config.i \
  $(ACE_ROOT)/ace/Reactor.h \
  $(ACE_ROOT)/ace/Handle_Set.h \
@@ -648,8 +646,6 @@ client:$(addprefix $(VDIR),$(CosProperty_CLIENT_OBJS))
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.i \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosPropertyServiceS.i \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.h \
- $(TAO_ROOT)/orbsvcs/orbsvcs/Property/CosPropertyService_i_T.cpp \
  $(TAO_ROOT)/orbsvcs/orbsvcs/Naming/Naming_Utils.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.h \
  $(TAO_ROOT)/orbsvcs/orbsvcs/CosNamingC.i \
diff --git a/TAO/tao/GIOP.cpp b/TAO/tao/GIOP.cpp
index 0006fee91a8..e6ac6fd445a 100644
--- a/TAO/tao/GIOP.cpp
+++ b/TAO/tao/GIOP.cpp
@@ -311,7 +311,8 @@ TAO_GIOP::send_request (TAO_Transport  *transport,
 // static CORBA::Octet
 static const char close_message [TAO_GIOP_HEADER_LEN] =
 {
-  'G', 'I', 'O', 'P',
+  // 'G', 'I', 'O', 'P',
+  0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
   TAO_GIOP_MessageHeader::MY_MAJOR,
   TAO_GIOP_MessageHeader::MY_MINOR,
   TAO_ENCAP_BYTE_ORDER,
@@ -356,7 +357,8 @@ TAO_GIOP::close_connection (TAO_Transport *transport, void *)
 static const char
 error_message [TAO_GIOP_HEADER_LEN] =
 {
-  'G', 'I', 'O', 'P',
+  // 'G', 'I', 'O', 'P',
+  0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
   TAO_GIOP_MessageHeader::MY_MAJOR,
   TAO_GIOP_MessageHeader::MY_MINOR,
   TAO_ENCAP_BYTE_ORDER,
@@ -604,10 +606,12 @@ TAO_GIOP::parse_header_std (TAO_InputCDR &cdr,
 {
   char *header = cdr.start_.rd_ptr ();
 
-  if (!(header [0] == 'G'
-        && header [1] == 'I'
-        && header [2] == 'O'
-        && header [3] == 'P'))
+  // The values are hard-coded to support non-ASCII platforms
+  if (!(header [0] == 0x47    // 'G'
+        && header [1] == 0x49 // 'I'
+        && header [2] == 0x4f // 'O'
+        && header [3] == 0x50 // 'P'
+        ))
     {
       ACE_DEBUG ((LM_DEBUG,
                   "TAO: (%P|%t) bad header, magic word [%c%c%c%c]\n",
@@ -704,7 +708,8 @@ TAO_GIOP::start_message_std (TAO_GIOP::Message_Type type,
 
   static CORBA::Octet header[] =
   {
-    'G', 'I', 'O', 'P',
+    // 'G', 'I', 'O', 'P',
+    0x47, 0x49, 0x4f, 0x50, // work on non-ASCII platforms...
     TAO_GIOP_MessageHeader::MY_MAJOR,
     TAO_GIOP_MessageHeader::MY_MINOR,
     TAO_ENCAP_BYTE_ORDER