ChangeLogTag:Fri Feb 25 10:47:33 2000 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

10 files changed, 41 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b3fce0e155..05bfd49a86f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Feb 25 10:47:33 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/config-win32-msvc.h,
+	* ace/config-win32-borland.h: Added ACE_INT64_FORMAT_SPECIFIER
+	  for both platforms.  Thanks to Christopher
+          Kohlhoff <chris@kohlhoff.com> for providing the fix.
+
 Thu Feb 24 15:44:42 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/ace-dll.icc: Added Capabilities.h and Capabilities.cpp.
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index 0b3fce0e155..05bfd49a86f 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,10 @@
+Fri Feb 25 10:47:33 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/config-win32-msvc.h,
+	* ace/config-win32-borland.h: Added ACE_INT64_FORMAT_SPECIFIER
+	  for both platforms.  Thanks to Christopher
+          Kohlhoff <chris@kohlhoff.com> for providing the fix.
+
 Thu Feb 24 15:44:42 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/ace-dll.icc: Added Capabilities.h and Capabilities.cpp.
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index 0b3fce0e155..05bfd49a86f 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,10 @@
+Fri Feb 25 10:47:33 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* ace/config-win32-msvc.h,
+	* ace/config-win32-borland.h: Added ACE_INT64_FORMAT_SPECIFIER
+	  for both platforms.  Thanks to Christopher
+          Kohlhoff <chris@kohlhoff.com> for providing the fix.
+
 Thu Feb 24 15:44:42 2000  Steve Huston  <shuston@riverace.com>
 
         * ace/ace-dll.icc: Added Capabilities.h and Capabilities.cpp.
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a
index 6212c464555..3200ad0b78c 100644
--- a/TAO/ChangeLogs/ChangeLog-02a
+++ b/TAO/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,12 @@
+Fri Feb 25 10:49:30 2000  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* orbsvcs/orbsvcs/CosConcurrencyControl.idl,
+	  orbsvcs/orbsvcs/RtecDefaultEventData.idl,
+ 	  orbsvcs/orbsvcs/RtecEventComm.idl: Fixed all three of these
+ 	  files so that they use the more portable #ifndef FOO rather than
+ 	  #if !defined (FOO) syntax.  Thanks to W. Craig Trader
+ 	  <ct7@vitelinc.com> for reporting this.
+
 Fri Feb 25 08:59:59 2000  Ossama Othman  <ossama@uci.edu>
 
 	* tao/IIOP_Acceptor.cpp (create_mprofile, open_default):
diff --git a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
index 1c7cc0d2994..3579be999c3 100644
--- a/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
+++ b/TAO/orbsvcs/orbsvcs/CosConcurrencyControl.idl
@@ -30,7 +30,7 @@
 // The part depending on the transaction service may be included by defining
 // TAO_HAS_TRANSACTION_CONTROL_SERVICE
 
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
+#ifdef TAO_HAS_TRANSACTION_CONTROL_SERVICE
 #include <CosTransactions.idl>
 #endif /* TAO_HAS_TRANSACTION_CONTROL_SERVICE */
 
@@ -66,7 +66,7 @@ module CosConcurrencyControl
   // unlock or change the mode of a lock is called and the specified
   // lock is not held
 
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
+#ifdef TAO_HAS_TRANSACTION_CONTROL_SERVICE
   // @@ The lock coordinator is designed for transactional lock sets,
   // so we don't support it (yet).
   interface LockCoordinator
@@ -118,14 +118,14 @@ module CosConcurrencyControl
       // until the new mode can be granted. If the lock is not held in
       // the specified mode the exception LockNotHeld is raised.
 
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
+#ifdef TAO_HAS_TRANSACTION_CONTROL_SERVICE
       LockCoordinator get_coordinator (in CosTransactions::Coordinator which);
       // Returns the lock coordinator associated with the specified
       // transaction.
 #endif /* TAO_HAS_TRANSACTION_CONTROL_SERVICE */
     };
 
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
+#ifdef TAO_HAS_TRANSACTION_CONTROL_SERVICE
   interface TransactionalLockSet
     {
       // = TITLE
@@ -184,7 +184,7 @@ module CosConcurrencyControl
       // Creates a lock set related to the specified lock set. Related lock
       // sets drop their locks together.
 
-#if defined (TAO_HAS_TRANSACTION_CONTROL_SERVICE)
+#ifdef TAO_HAS_TRANSACTION_CONTROL_SERVICE
       TransactionalLockSet create_transactional ();
       // Creates a new TransactionalLockSet and lock coordinator for
       // transactional mode clients.
diff --git a/TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl b/TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl
index 37853107ef8..5b80fc0d25d 100644
--- a/TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecDefaultEventData.idl
@@ -10,7 +10,7 @@
 typedef sequence<octet> EventPayload;
 struct RtecEventData
 {
-#if !defined (TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE)
+#ifndef TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE
   long pad1;
   // This two objects ensure that the encapsulated stream below is
   // properly aligned; this makes the decoding of the payload more
@@ -27,7 +27,7 @@ struct RtecEventData
   EventPayload payload;
 #endif /* TAO_LACKS_EVENT_CHANNEL_OCTET_SEQUENCE */
 
-#if !defined (TAO_LACKS_EVENT_CHANNEL_ANY)
+#ifndef TAO_LACKS_EVENT_CHANNEL_ANY
   any any_value;
 #endif /* TAO_LACKS_EVENT_CHANNEL_ANY */
 };
diff --git a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
index 3b0a636165a..f04ce0e2fc5 100644
--- a/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
+++ b/TAO/orbsvcs/orbsvcs/RtecEventComm.idl
@@ -60,7 +60,7 @@ module RtecEventComm
     // A time value, the name is a bit misleading, it is used for
     // timestamping but also used to setup timers in the consumer
     // subscriptions.
-#if !defined (TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS)
+#ifndef TAO_LACKS_EVENT_CHANNEL_TIMESTAMPS
     Time ec_recv_time;
     Time ec_send_time;
     // Some timestamps, they actually belong in the payload, for some
diff --git a/THANKS b/THANKS
index e6a4f77db5a..abc0ce7b50a 100644
--- a/THANKS
+++ b/THANKS
@@ -907,6 +907,7 @@ Alex Brown <abrown@3com-ne.com>
 Rich Seibel <seibel_r@ociweb.com>
 Jim Scheller <csoftware@iname.com>
 Sandeep Adwankar <adwankar@rsch.comm.mot.com>
+W. Craig Trader <ct7@vitelinc.com> 
 
 I would particularly like to thank Paul Stephenson, who worked with me
 at Ericsson.  Paul devised the recursive Makefile scheme that
diff --git a/ace/config-win32-borland.h b/ace/config-win32-borland.h
index 73fa027d758..00fbceb0728 100644
--- a/ace/config-win32-borland.h
+++ b/ace/config-win32-borland.h
@@ -64,6 +64,7 @@
 # define ACE_SIZEOF_LONG_DOUBLE 10
 # define ACE_TEMPLATES_REQUIRE_SOURCE 1
 # define ACE_UINT64_FORMAT_SPECIFIER "%Lu"
+# define ACE_INT64_FORMAT_SPECIFIER "%Ld"
 # define ACE_USES_STD_NAMESPACE_FOR_STDCPP_LIB 1
 
 /* need to ensure these are included before <iomanip> */
diff --git a/ace/config-win32-msvc.h b/ace/config-win32-msvc.h
index e98f2fd5147..5e9298631b6 100644
--- a/ace/config-win32-msvc.h
+++ b/ace/config-win32-msvc.h
@@ -202,6 +202,7 @@ inline void *operator new (unsigned int, void *p) { return p; }
 # pragma warning(default: 4201)  /* winnt.h uses nameless structs */
 
 // At least for Win32 - MSVC compiler (ver. 5)
+# define ACE_INT64_FORMAT_SPECIFIER "%I64d"
 # define ACE_UINT64_FORMAT_SPECIFIER "%I64u"
 
 #endif /* _MSC_VER */