summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-18 02:14:13 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-18 02:14:13 +0000
commit174db92e2956d2f04772b06c604e5291b6b8d0db (patch)
tree93dd0a51b8c8edb3eb5d319ffef1323e51288fae
parent43a4e59aab6b5c790918c96b69f944b1b8b8653d (diff)
downloadATCD-174db92e2956d2f04772b06c604e5291b6b8d0db.tar.gz
ChangeLogTag:Thu Sep 17 18:53:05 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--apps/JAWS/ChangeLog2
-rw-r--r--apps/JAWS/PROTOTYPE/JAWS/IO.cpp6
-rw-r--r--apps/JAWS/server/IO.cpp6
3 files changed, 7 insertions, 7 deletions
diff --git a/apps/JAWS/ChangeLog b/apps/JAWS/ChangeLog
index ab50ecd1198..b4518afc4da 100644
--- a/apps/JAWS/ChangeLog
+++ b/apps/JAWS/ChangeLog
@@ -2,7 +2,7 @@ Thu Sep 17 18:53:05 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
* server/IO.cpp:
* PROTOTYPE/JAWS/IO.cpp:
- Revert back to iovec.
+ Revert back to iovec. Also added some missing casts.
Wed Sep 16 22:53:06 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
diff --git a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
index 150b9457a6f..f087076ae3c 100644
--- a/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
+++ b/apps/JAWS/PROTOTYPE/JAWS/IO.cpp
@@ -165,19 +165,19 @@ JAWS_Synch_IO::transmit_file (JAWS_IO_Handler *ioh,
int iovcnt = 0;
if (header_size > 0)
{
- iov[iovcnt].iov_base = (char*)header;
+ iov[iovcnt].iov_base = ACE_const_cast(char*,header);
iov[iovcnt].iov_len = header_size;
iovcnt++;
}
if (handle.size () > 0)
{
- iov[iovcnt].iov_base = handle.address ();
+ iov[iovcnt].iov_base = ACE_reinterpret_cast(char*,handle.address ());
iov[iovcnt].iov_len = handle.size ();
iovcnt++;
}
if (trailer_size > 0)
{
- iov[iovcnt].iov_base = (char*)trailer;
+ iov[iovcnt].iov_base = ACE_const_cast(char*,trailer);
iov[iovcnt].iob_len = trailer_size;
iovcnt++;
}
diff --git a/apps/JAWS/server/IO.cpp b/apps/JAWS/server/IO.cpp
index 90e743642a5..d445d96fee1 100644
--- a/apps/JAWS/server/IO.cpp
+++ b/apps/JAWS/server/IO.cpp
@@ -125,19 +125,19 @@ JAWS_Synch_IO::transmit_file (const char *filename,
int iovcnt = 0;
if (header_size > 0)
{
- iov[iovcnt].iov_base = (char*)header;
+ iov[iovcnt].iov_base = ACE_const_cast(char*, header);
iov[iovcnt].iov_len = header_size;
iovcnt++;
}
if (handle.size () > 0)
{
- iov[iovcnt].iov_base = handle.address ();
+ iov[iovcnt].iov_base = ACE_reinterpret_cast(char*,handle.address ());
iov[iovcnt].iov_len = handle.size ();
iovcnt++;
}
if (trailer_size > 0)
{
- iov[iovcnt].iov_base = (char*)trailer;
+ iov[iovcnt].iov_base = ACE_const_cast(char*, trailer);
iov[iovcnt].iov_len = trailer_size;
iovcnt++;
}