summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2001-03-18 15:47:42 +0000
committerbala <balanatarajan@users.noreply.github.com>2001-03-18 15:47:42 +0000
commit02c270078816b7c6b8e9ee79689c7bfeca929505 (patch)
treed8a0ba89ec72f48330dc114f01497e4e8fe51139
parent27d1265806cc2306b7c2a2be6a225beccaf681e0 (diff)
downloadATCD-02c270078816b7c6b8e9ee79689c7bfeca929505.tar.gz
ChangeLogTag: Sun Mar 18 09:46:47 2001 Balachandran Natarajan <bala@cs.wustl.edu>
-rw-r--r--ChangeLog4
-rw-r--r--ChangeLogs/ChangeLog-02a4
-rw-r--r--ChangeLogs/ChangeLog-03a4
-rw-r--r--tests/New_Fail_Test.cpp22
4 files changed, 24 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index f219dd5fa1f..5d11846dcb3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Mar 18 09:46:47 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tests/New_Fail_Test.cpp: Fixed warnings in g++.
+
Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index f219dd5fa1f..5d11846dcb3 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,7 @@
+Sun Mar 18 09:46:47 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tests/New_Fail_Test.cpp: Fixed warnings in g++.
+
Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index f219dd5fa1f..5d11846dcb3 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,7 @@
+Sun Mar 18 09:46:47 2001 Balachandran Natarajan <bala@cs.wustl.edu>
+
+ * tests/New_Fail_Test.cpp: Fixed warnings in g++.
+
Sun Mar 18 08:31:34 2001 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* examples/IPC_SAP/FILE_SAP/client.cpp (main): Added a couple of
diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp
index 283be9f9817..e0e7964683f 100644
--- a/tests/New_Fail_Test.cpp
+++ b/tests/New_Fail_Test.cpp
@@ -40,19 +40,19 @@ ACE_RCSID(tests, New_Fail_Test, "$Id$")
// somewhere else in the test.
// 1MB
-static const int BIG_BLOCK = 1024*1024;
+static const int BIG_BLOCK = 1024*1024;
// about 4GB max in the test
-static const int MAX_ALLOCS_IN_TEST = 4096;
+static const int MAX_ALLOCS_IN_TEST = 4096;
-static void
+static void
try_ace_new (char **p)
{
ACE_NEW (*p, char[BIG_BLOCK]);
return;
}
-static char *
+static char *
try_ace_new_return (void)
{
char *p = 0;
@@ -79,10 +79,12 @@ main (int, ACE_TCHAR *[])
// Use the static function addresses, to prevent warnings about the
// functions not being used.
- if (&try_ace_new)
- /* NULL */;
- if (&try_ace_new_return)
- /* NULL */;
+ // if (&try_ace_new)
+ ///* NULL */;
+ //if (&try_ace_new_return)
+ ///* NULL */;
+ ACE_UNUSED_ARG (try_ace_new);
+ ACE_UNUSED_ARG (try_ace_new_return);
#else
char *blocks[MAX_ALLOCS_IN_TEST];
@@ -104,7 +106,7 @@ main (int, ACE_TCHAR *[])
ACE_ERROR((LM_WARNING,
ACE_TEXT ("Test didn't exhaust all available memory\n")));
// Back up to valid pointer for deleting.
- --i;
+ --i;
}
else
{
@@ -132,7 +134,7 @@ main (int, ACE_TCHAR *[])
ACE_ERROR ((LM_WARNING,
ACE_TEXT ("Test didn't exhaust all available memory\n")));
// Back up to valid pointer.
- --i;
+ --i;
}
else
{