diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-03-23 12:36:01 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-03-23 12:36:01 +0000 |
| commit | c96a52804336f152f2bb4ae3686593b3ad106b3c (patch) | |
| tree | a00fb0c235453e2eabeff045735f2023b3cf6153 | |
| parent | 802dd148df768ecbd9b4691229bd2280d0833924 (diff) | |
| download | ATCD-c96a52804336f152f2bb4ae3686593b3ad106b3c.tar.gz | |
ChangeLogTag: Fri Mar 23 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | tests/New_Fail_Test.cpp | 14 |
4 files changed, 24 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog index ce8f651407a..81f3ea671f2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Fri Mar 23 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++, + No_AMI_Messaging builds. Surprising that it showed up only in + this build. + Thu Mar 22 21:33:37 2001 Chris Cleeland <cleeland_c@ociweb.com> * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index ce8f651407a..81f3ea671f2 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Fri Mar 23 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++, + No_AMI_Messaging builds. Surprising that it showed up only in + this build. + Thu Mar 22 21:33:37 2001 Chris Cleeland <cleeland_c@ociweb.com> * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index ce8f651407a..81f3ea671f2 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Fri Mar 23 06:34:33 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tests/New_Fail_Test.cpp: Fixed a stupid warning in g++, + No_AMI_Messaging builds. Surprising that it showed up only in + this build. + Thu Mar 22 21:33:37 2001 Chris Cleeland <cleeland_c@ociweb.com> * ace/INET_Addr.h: VxWorks' inet_ntoa doesn't behave like most diff --git a/tests/New_Fail_Test.cpp b/tests/New_Fail_Test.cpp index e0e7964683f..e6e55e7f6b5 100644 --- a/tests/New_Fail_Test.cpp +++ b/tests/New_Fail_Test.cpp @@ -45,6 +45,9 @@ static const int BIG_BLOCK = 1024*1024; // about 4GB max in the test static const int MAX_ALLOCS_IN_TEST = 4096; +#if (defined (__SUNPRO_CC) || defined (__GNUG__)) && \ + !defined (ACE_HAS_EXCEPTIONS) + static void try_ace_new (char **p) { @@ -60,6 +63,9 @@ try_ace_new_return (void) return p; } +#endif /**/ + + int main (int, ACE_TCHAR *[]) { @@ -77,14 +83,6 @@ main (int, ACE_TCHAR *[]) ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("Out-of-memory will throw an unhandled exception\n"))); ACE_DEBUG ((LM_NOTICE, ACE_TEXT ("Rebuild with exceptions=1 to prevent this, but it may impair performance.\n"))); - // 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 */; - ACE_UNUSED_ARG (try_ace_new); - ACE_UNUSED_ARG (try_ace_new_return); #else char *blocks[MAX_ALLOCS_IN_TEST]; |