summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2007-11-01 10:23:46 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2007-11-01 10:23:46 +0000
commitd513ed109b91469ce1791310121b66f0272abff8 (patch)
tree2f70aa75d884f74291e100cebbb54e4056b4e9bf
parente6bb24e5e878b94702045d9b7ab12f251c79ae3a (diff)
downloadATCD-d513ed109b91469ce1791310121b66f0272abff8.tar.gz
Thu Nov 1 10:23:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
-rw-r--r--ACE/ChangeLog7
-rw-r--r--ACE/tests/Malloc_Test.cpp4
2 files changed, 9 insertions, 2 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 698fd42918f..6e353af1915 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,10 @@
+Thu Nov 1 10:23:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
+
+ * tests/Malloc_Test.cpp:
+ Initialise some pointers with 0 to fix gcc 4.2 warnings. Thanks
+ to Robert Iakobashvili <coroberti at gmail dot com> for reporting
+ this
+
Thu Nov 1 09:27:15 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>
* tests/Process.h:
diff --git a/ACE/tests/Malloc_Test.cpp b/ACE/tests/Malloc_Test.cpp
index 50f3378f690..14a07aa19c2 100644
--- a/ACE/tests/Malloc_Test.cpp
+++ b/ACE/tests/Malloc_Test.cpp
@@ -153,7 +153,7 @@ initialize (MALLOC *allocator)
*temp = 5.0;
allocator->free (temp);
- void *ptr;
+ void *ptr = 0;
ACE_ALLOCATOR_RETURN (ptr,
allocator->malloc (sizeof (Test_Data)),
0);
@@ -285,7 +285,7 @@ parent (Test_Data *data)
static int
child (void)
{
- void *bar;
+ void *bar = 0;
// Perform "busy waiting" here until the parent stores data under a
// new name called "bar" in <ACE_Malloc>. This isn't a good design
// -- it's just to test that synchronization is working across