summaryrefslogtreecommitdiff
path: root/apps
diff options
context:
space:
mode:
authorjxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-19 06:42:55 +0000
committerjxh <jxh@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-07-19 06:42:55 +0000
commit274cf51e12b05fb4ccde01a84930616d56508623 (patch)
treec4dbc3ae8d2a5ee228a910742a0ef8476d549d29 /apps
parentca4be95c6d456f4f1c9f684249c645b496f4cf27 (diff)
downloadATCD-274cf51e12b05fb4ccde01a84930616d56508623.tar.gz
Changed static casts to re-interpret casts to pacify GCC.
BTW, the last set of revisions were done by James borrowing Michael's account.
Diffstat (limited to 'apps')
-rw-r--r--apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.cpp8
-rw-r--r--apps/JAWS/PROTOTYPE/JAWS/Makefile1
2 files changed, 4 insertions, 5 deletions
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.cpp b/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.cpp
index 1fcf9b1b8db..e03c1f50c41 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/Assoc_Array.cpp
@@ -10,14 +10,14 @@ JAWS_Assoc_Array<KEY,DATA>::JAWS_Assoc_Array (int maxsize)
{
typedef void * ptr_type;
- this->k_array_ = ACE_static_cast(KEY **, new ptr_type[this->maxsize_]);
+ this->k_array_ = ACE_reinterpret_cast(KEY **, new ptr_type[this->maxsize_]);
if (this->k_array_ == 0)
{
this->maxsize_ = 0;
return;
}
- this->d_array_ = ACE_static_cast(DATA **, new ptr_type[this->maxsize_]);
+ this->d_array_ = ACE_reinterpret_cast(DATA **, new ptr_type[this->maxsize_]);
if (this->d_array_ == 0)
{
delete[] this->k_array_;
@@ -37,8 +37,8 @@ JAWS_Assoc_Array<KEY,DATA>::~JAWS_Assoc_Array (void)
{
this->clear ();
- delete[] ACE_static_cast(void *, this->k_array_);
- delete[] ACE_static_cast(void *, this->d_array_);
+ delete[] ACE_reinterpret_cast(void **, this->k_array_);
+ delete[] ACE_reinterpret_cast(void **, this->d_array_);
this->k_array_ = 0;
this->d_array_ = 0;
diff --git a/apps/JAWS/PROTOTYPE/JAWS/Makefile b/apps/JAWS/PROTOTYPE/JAWS/Makefile
index abe8aef3fc1..c27298ec0b2 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/Makefile
+++ b/apps/JAWS/PROTOTYPE/JAWS/Makefile
@@ -14,7 +14,6 @@ LIB = libJAWS.a
SHLIB = libJAWS.$(SOEXT)
MYFILES = \
- Assoc_Array \
Waiter \
Pipeline \
Pipeline_Tasks \