Borrowed Borland DES_FREE fixes for MSVC++.

4 files changed, 42 insertions, 34 deletions

diff --git a/apps/JAWS2/JAWS/Cache_Hash_T.cpp b/apps/JAWS2/JAWS/Cache_Hash_T.cpp
index c2a25fd863d..a908c4147f1 100644
--- a/apps/JAWS2/JAWS/Cache_Hash_T.cpp
+++ b/apps/JAWS2/JAWS/Cache_Hash_T.cpp
@@ -85,18 +85,18 @@ JAWS_Cache_Hash<EXT_ID,HASH_FUNC,EQ_FUNC>::~JAWS_Cache_Hash (void)
         {
           if (this->hashtable_[i])
             {
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
+
               ACE_DES_FREE_TEMPLATE3(this->hashtable_[i],
                                      this->allocator_->free,
                                      JAWS_Hash_Bucket_Manager,
                                      EXT_ID,
                                      JAWS_Cache_Object *,
                                      EQ_FUNC);
-#else
-              ACE_DES_FREE(this->hashtable_[i],
-                           this->allocator_->free,
-                           CACHE_BUCKET_MANAGER);
-#endif
+
+
+
+
+
               this->hashtable_[i] = 0;
             }
         }
diff --git a/apps/JAWS2/JAWS/Cache_Heap_T.cpp b/apps/JAWS2/JAWS/Cache_Heap_T.cpp
index 36575ef2741..b19ff8e79b1 100644
--- a/apps/JAWS2/JAWS/Cache_Heap_T.cpp
+++ b/apps/JAWS2/JAWS/Cache_Heap_T.cpp
@@ -41,8 +41,10 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::~JAWS_Cache_Heap (void)
         {
           if (this->heap_[i])
             {
-              ACE_DES_FREE (this->heap_[i], this->allocator_->free,
-                            Cache_Heap_Item);
+              ACE_DES_FREE_TEMPLATE4(this->heap_[i], this->allocator_->free,
+                                     JAWS_Cache_Heap_Item,
+                                     EXT_ID, FACT, H_FN, E_FN);
+
               this->heap_[i] = 0;
             }
         }
@@ -217,7 +219,10 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
   ext_id = item->ext_id_;
   int_id = item->int_id_;
 
-  ACE_DES_FREE (item, this->allocator_->free, Cache_Heap_Item);
+  ACE_DES_FREE_TEMPLATE4(item, this->allocator_->free,
+                         JAWS_Cache_Heap_Item,
+                         EXT_ID, FACT, H_FN, E_FN);
+
   item = 0;
   return 0;
 }
@@ -237,7 +242,10 @@ JAWS_Cache_Heap<EXT_ID,FACT,H_FN,E_FN>::remove (void *item)
   real_item->int_id_->heap_item (0);
   this->remove_i (real_item->heap_idx_);
 
-  ACE_DES_FREE (real_item, this->allocator_->free, Cache_Heap_Item);
+  ACE_DES_FREE_TEMPLATE4(real_item, this->allocator_->free,
+                         JAWS_Cache_Heap_Item,
+                         EXT_ID, FACT, H_FN, E_FN);
+
   real_item = 0;
 
   return 0;
diff --git a/apps/JAWS2/JAWS/Cache_List_T.cpp b/apps/JAWS2/JAWS/Cache_List_T.cpp
index 278d85e00ea..42a493aee55 100644
--- a/apps/JAWS2/JAWS/Cache_List_T.cpp
+++ b/apps/JAWS2/JAWS/Cache_List_T.cpp
@@ -155,13 +155,13 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (EXT_ID &ext_id,
   int_id = this->item_->int_id_;
   int_id->heap_item (0);
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
+
   ACE_DES_FREE_TEMPLATE4(this->item_, this->allocator_->free,
                          JAWS_Cache_List_Item,
                          EXT_ID, FACT, H_FN, E_FN);
-#else
-  ACE_DES_FREE (this->item_, this->allocator_->free, Cache_List_Item);
-#endif
+
+
+
   this->item_ = 0;
   return 0;
 }
@@ -175,13 +175,13 @@ JAWS_Cache_List<EXT_ID,FACT,H_FN,E_FN>::remove (void *item)
   this->remove_i ((Cache_List_Item *) item);
   this->item_->int_id_->heap_item (0);
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
+
   ACE_DES_FREE_TEMPLATE4(this->item_, this->allocator_->free,
                          JAWS_Cache_List_Item,
                          EXT_ID, FACT, H_FN, E_FN);
-#else
-  ACE_DES_FREE (this->item_, this->allocator_->free, Cache_List_Item);
-#endif
+
+
+
   this->item_ = 0;
 
   return 0;
diff --git a/apps/JAWS2/JAWS/Cache_Manager_T.cpp b/apps/JAWS2/JAWS/Cache_Manager_T.cpp
index eb1dcf666ca..2d05437276c 100644
--- a/apps/JAWS2/JAWS/Cache_Manager_T.cpp
+++ b/apps/JAWS2/JAWS/Cache_Manager_T.cpp
@@ -71,13 +71,13 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
     {
       this->maxsize_ = 0;
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
+
       ACE_DES_FREE_TEMPLATE3(this->hash_, this->allocator_->free,
                              JAWS_Cache_Hash,
                              KEY, HASH_FUNC, EQ_FUNC);
-#else
-      ACE_DES_FREE (this->hash_, this->allocator_->free, Cache_Hash);
-#endif
+
+
+
       this->hash_ = 0;
       this->hashsize_ = 0;
     }
@@ -143,13 +143,13 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>
       errno = ENOMEM;
       this->maxsize_ = 0;
 
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
+
       ACE_DES_FREE_TEMPLATE3(this->hash_, this->allocator_->free,
                              JAWS_Cache_Hash,
                              KEY, HASH_FUNC, EQ_FUNC);
-#else
-      ACE_DES_FREE (this->hash_, this->allocator_->free, Cache_Hash);
-#endif
+
+
+
       this->hash_ = 0;
       this->hashsize_ = 0;
 
@@ -174,25 +174,25 @@ JAWS_Cache_Manager<KEY,FACTORY,HASH_FUNC,EQ_FUNC>::close (void)
 
   if (this->hash_)
     {
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
+
       ACE_DES_FREE_TEMPLATE3(this->hash_, this->allocator_->free,
                              JAWS_Cache_Hash,
                              KEY, HASH_FUNC, EQ_FUNC);
-#else
-      ACE_DES_FREE (this->hash_, this->allocator_->free, Cache_Hash);
-#endif
+
+
+
       this->hash_ = 0;
     }
 
   if (this->heap_)
     {
-#if defined (__BORLANDC__) && (__BORLANDC__ <= 0x540)
+
       ACE_DES_FREE_TEMPLATE4(this->heap_, this->allocator_->free,
                              JAWS_Cache_List,
                              KEY, FACTORY, HASH_FUNC, EQ_FUNC);
-#else
-      ACE_DES_FREE (this->heap_, this->allocator_->free, Cache_Heap);
-#endif
+
+
+
       this->heap_ = 0;
     }