Support for Borland C++ 5.x as DLL

7 files changed, 15 insertions, 30 deletions

diff --git a/ace/Containers.cpp b/ace/Containers.cpp
index 19d566b4f37..43358d8b5cf 100644
--- a/ace/Containers.cpp
+++ b/ace/Containers.cpp
@@ -228,7 +228,7 @@ ACE_Unbounded_Stack<T>::push (const T &new_item)
 {
   //  ACE_TRACE ("ACE_Unbounded_Stack<T>::push");
 
-  ACE_Node<T> *temp = 0;
+  ACE_Node<T> *temp;
 
   ACE_NEW_MALLOC_RETURN (temp,
                          (ACE_Node<T>*) this->allocator_->malloc (sizeof (ACE_Node<T>)),
diff --git a/ace/Message_Queue_T.cpp b/ace/Message_Queue_T.cpp
index a7249b52123..4fc2794ed08 100644
--- a/ace/Message_Queue_T.cpp
+++ b/ace/Message_Queue_T.cpp
@@ -758,7 +758,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i (ACE_Message_Block *new_item
 {
   ACE_TRACE ("ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::enqueue_i");
 
-  int result = 0;
+  int result;
 
   // get the current time
   ACE_Time_Value current_time = ACE_OS::gettimeofday ();  
@@ -809,7 +809,7 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::dequeue_head (ACE_Message_Block *&firs
       return -1;
     }
 
-  int result = 0;
+  int result;
 
   // get the current time
   ACE_Time_Value current_time = ACE_OS::gettimeofday ();
@@ -952,8 +952,8 @@ ACE_Dynamic_Message_Queue<ACE_SYNCH_USE>::remove_stale_messages (const ACE_Time_
       // management scheme to be configured in either case.
       ACE_Message_Block *temp1 = remove_head;
       ACE_Message_Block *temp2 = remove_head->next ();
-      ACE_Message_Block *size_temp = 0;
-      size_t msg_size = 0;
+      ACE_Message_Block *size_temp;
+      size_t msg_size;
       while (temp1)
       {
         // Make sure to count *all* the bytes in a composite message!!!
diff --git a/ace/OS.h b/ace/OS.h
index 1bc2001c93a..9ce35ae0c81 100644
--- a/ace/OS.h
+++ b/ace/OS.h
@@ -366,20 +366,19 @@
 
 // First, we define how to properly export/import objects.
 # if defined (ACE_WIN32)         // Only Win32 needs special treatment.
-#   if defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530)
-/*  Microsoft, Borland C++ Builder: */
+#   if defined(_MSC_VER) || defined(__BORLANDC__)
+/*  Microsoft, Borland: */
 #     define ACE_Proper_Export_Flag __declspec (dllexport)
 #     define ACE_Proper_Import_Flag __declspec (dllimport)
 #     define ACE_EXPORT_SINGLETON_DECLARATION(T)  template class __declspec (dllexport) T
 #     define ACE_IMPORT_SINGLETON_DECLARATION(T)  extern template class T
-#   else /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
-/* Non-Microsoft, other versions of Borland: */
+#   else /* defined(_MSC_VER) || defined(__BORLANDC__) */
+/* Non-Microsoft, non-Borland: */
 #     define ACE_Proper_Export_Flag _export
 #     define ACE_Proper_Import_Flag _import
-//   @@ Don't know how to handle this when using Borland's compilers.
 #     define ACE_EXPORT_SINGLETON_DECLARATION(T)
 #     define ACE_IMPORT_SINGLETON_DECLARATION(T)
-#   endif /* defined(_MSC_VER) || (defined(__BORLANDC__) && __BORLANDC__ >= 0x0530) */
+#   endif /* defined(_MSC_VER) || defined(__BORLANDC__) */
 # else  /* ! ACE_WIN32 */
 #   define ACE_Proper_Export_Flag
 #   define ACE_Proper_Import_Flag
diff --git a/ace/SString.h b/ace/SString.h
index 4164c63bb39..b3c48be5445 100644
--- a/ace/SString.h
+++ b/ace/SString.h
@@ -40,11 +40,6 @@ class ACE_Export ACE_CString
   //   Instead, its internal representation is set equal to a global
   //   empty string.
 public:
-  friend ACE_Export ACE_CString operator+ (const ACE_CString &, const ACE_CString &);
-#if !defined (ACE_HAS_WINCE)
-  friend ACE_Export ostream &operator<< (ostream &, const ACE_CString &);
-#endif /* ! ACE_HAS_WINCE */
-
   static const int npos;
   // No position constant
 
@@ -188,10 +183,6 @@ class ACE_Export ACE_SString
   //   ACE_Allocator with a persistable memory pool
 {
 public:
-#if !defined (ACE_HAS_WINCE)
-  friend ACE_Export ostream &operator<< (ostream &, const ACE_SString &);
-#endif /* ! ACE_HAS_WINCE */
-
   static const int npos;
   // No position constant
 
@@ -315,11 +306,6 @@ class ACE_Export ACE_WString
   //   memory The user can make this a persistant class by providing
   //   an ACE_Allocator with a persistable memory pool
 {
-  friend ACE_Export ACE_WString operator+ (const ACE_WString &, const ACE_WString &);
-#if !defined (ACE_HAS_WINCE)
-  friend ACE_Export ostream &operator<< (ostream &, const ACE_WString &);
-#endif /* ! ACE_HAS_WINCE */
-
 public:
   static const int npos;
   // No position constant
diff --git a/ace/Stream.cpp b/ace/Stream.cpp
index bf8e7db06de..893f24cf373 100644
--- a/ace/Stream.cpp
+++ b/ace/Stream.cpp
@@ -345,7 +345,7 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
   ACE_TRACE ("ACE_Stream<ACE_SYNCH_USE>::control");
   ACE_IO_Cntl_Msg ioc (cmd);
 
-  ACE_Message_Block *db = 0;
+  ACE_Message_Block *db;
 
   // Try to create a data block that contains the user-supplied data.
   ACE_NEW_RETURN (db, ACE_Message_Block (sizeof (int), 
@@ -371,7 +371,7 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
       return -1;
     }
 
-  int result = 0;
+  int result;
 
   if (this->stream_head_->writer ()->put (cb) == -1)
     result = -1;
@@ -381,7 +381,7 @@ ACE_Stream<ACE_SYNCH_USE>::control (ACE_IO_Cntl_Msg::ACE_IO_Cntl_Cmds cmd,
     result = ((ACE_IO_Cntl_Msg *) cb->rd_ptr ())->rval ();
 
   // This will also release db if it's reference count == 0.
-  cb->release (); 
+  cb->release ();
 
   return result;
 }
diff --git a/ace/Timer_Heap_T.cpp b/ace/Timer_Heap_T.cpp
index ad8ff2e5056..cdc7d8c896e 100644
--- a/ace/Timer_Heap_T.cpp
+++ b/ace/Timer_Heap_T.cpp
@@ -392,7 +392,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 
    // First grow the heap itself.
 
-  ACE_Timer_Node_T<TYPE> **new_heap = 0;
+  ACE_Timer_Node_T<TYPE> **new_heap;
   ACE_NEW (new_heap, (ACE_Timer_Node_T<TYPE> *[new_size]));
   ACE_OS::memcpy (new_heap, this->heap_,
                   max_size_ * sizeof *new_heap);
@@ -401,7 +401,7 @@ ACE_Timer_Heap_T<TYPE, FUNCTOR, ACE_LOCK>::grow_heap (void)
 
   // Grow the array of timer ids.
 
-  long *new_timer_ids = 0;
+  long *new_timer_ids;
 
   ACE_NEW (new_timer_ids, long[new_size]);
 
diff --git a/ace/ace_bcc.ide b/ace/ace_bcc.ide
index 9724de0832e..247e8d70872 100644
--- a/ace/ace_bcc.ide
+++ b/ace/ace_bcc.ide