summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-17 13:44:46 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-09-17 13:44:46 +0000
commitfd575a1a20f8e9be864570f5ef86279d1543f4a9 (patch)
treee579820039b5c2173e38e7381ce0ae7384b2b1b5
parent075b713007606e0089a50df208c8e24a003b9878 (diff)
downloadATCD-fd575a1a20f8e9be864570f5ef86279d1543f4a9.tar.gz
ChangeLogTag:Thu Sep 17 08:41:14 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
-rw-r--r--ChangeLog-98b9
-rw-r--r--ace/Containers.i1
-rw-r--r--examples/Shared_Malloc/test_malloc.cpp4
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index 5c4df969048..20583d8ca29 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,3 +1,12 @@
+Thu Sep 17 08:41:14 1998 Carlos O'Ryan <coryan@cs.wustl.edu>
+
+ * examples/Shared_Malloc/test_malloc.cpp:
+ Fixed soem problems with my changes to rand_r()
+
+ * ace/Containers.i:
+ Resurrected this file to avoid problems with dependencies in
+ TAO.
+
Thu Sep 17 08:41:24 1998 Steve Huston <shuston@riverace.com>
* include/makeinclude/platform_hpux_gcc.GNU: Added -L. to LDFLAGS.
diff --git a/ace/Containers.i b/ace/Containers.i
new file mode 100644
index 00000000000..cfa1da318d3
--- /dev/null
+++ b/ace/Containers.i
@@ -0,0 +1 @@
+// $Id$
diff --git a/examples/Shared_Malloc/test_malloc.cpp b/examples/Shared_Malloc/test_malloc.cpp
index 89b9169dbf6..3d89ac66133 100644
--- a/examples/Shared_Malloc/test_malloc.cpp
+++ b/examples/Shared_Malloc/test_malloc.cpp
@@ -14,8 +14,8 @@ static int
gen_size (void)
{
#if defined (ACE_HAS_THREADS)
- ACE_RANDR_TYPE seed = ACE_RANDR_TYPE (&seed);
- return (ACE_OS::rand_r (ACE_RANDR_TYPE (seed)) % Options::instance ()->max_msg_size ()) + 1;
+ ACE_RANDR_TYPE seed = ACE_reinterpret_cast (ACE_RANDR_TYPE, &seed);
+ return (ACE_OS::rand_r (seed) % Options::instance ()->max_msg_size ()) + 1;
#else
return (ACE_OS::rand () % Options::instance ()->max_msg_size ()) + 1;
#endif /* ACE_HAS_THREADS */