summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-03-31 16:35:53 +0000
committeriliyan <iliyan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-03-31 16:35:53 +0000
commita3019bb1c31de3d2d785a63b2c22273fb5dc9837 (patch)
tree8af86100e96c01330fc9d2d565ffa0e865212d09
parentf90d57c6de551978a15f55cb6e91323285458984 (diff)
downloadATCD-a3019bb1c31de3d2d785a63b2c22273fb5dc9837.tar.gz
Merged revisions 81173-81174 via svnmerge from
https://svn.dre.vanderbilt.edu/DOC/Middleware/trunk/ACE ........ r81173 | johnnyw | 2008-03-31 11:15:48 -0500 (Mon, 31 Mar 2008) | 1 line ........ r81174 | iliyan | 2008-03-31 11:16:06 -0500 (Mon, 31 Mar 2008) | 1 line ChangeLogTag: Mon Mar 31 16:15:17 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com> ........
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/tests/OS_Test.cpp2
2 files changed, 8 insertions, 0 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 2a091c4ed32..a5afac60154 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Mon Mar 31 16:15:17 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
+
+ * tests/tests.mpc:
+
+ Adding Intrusive_Auto_Ptr_Test to the list
+
Mon Mar 31 14:52:58 UTC 2008 Iliyan Jeliazkov <iliyan@ociweb.com>
* ace/Intrusive_Auto_Ptr.h:
diff --git a/ACE/tests/OS_Test.cpp b/ACE/tests/OS_Test.cpp
index 1d6665dba89..3189a56e7f3 100644
--- a/ACE/tests/OS_Test.cpp
+++ b/ACE/tests/OS_Test.cpp
@@ -963,6 +963,8 @@ last_error_test (void)
}
ACE_OS::last_error (0);
+
+ return 0;
}
int