summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcbeaulac <cbeaulac@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-05-11 12:48:39 +0000
committercbeaulac <cbeaulac@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2011-05-11 12:48:39 +0000
commita6c4a4ce5f883e9d016e3ffda5ee997eb27b3e02 (patch)
treed81da5786c4fcd287d6be8f302b072b2a03683ad
parentb857e8bbf260e8ae3702b767235bc8109d5975f9 (diff)
downloadATCD-a6c4a4ce5f883e9d016e3ffda5ee997eb27b3e02.tar.gz
Wed May 11 12:45:21 UTC 2011 Chad Beaulac <chad.beaulac@objectivesolutions.com>
* tests/Bug_3912_Regression_Test.cpp Returning a value from close now. * tests/tests.mpc Removed libs Stream_Config_Stream_DLL. It's dynamically loaded by the ASR.
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/tests/Bug_3912_Regression_Test.cpp1
-rw-r--r--ACE/tests/tests.mpc1
3 files changed, 9 insertions, 1 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index d7cb2aac941..c66c73e5011 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Wed May 11 12:45:21 UTC 2011 Chad Beaulac <chad.beaulac@objectivesolutions.com>
+ * tests/Bug_3912_Regression_Test.cpp
+ Returning a value from close now.
+
+ * tests/tests.mpc
+ Removed libs Stream_Config_Stream_DLL.
+ It's dynamically loaded by the ASR.
+
Tue May 10 11:59:32 UTC 2011 Chad Beaulac <chad.beaulac@objectivesolutions.com>
* ace/Stream.cpp
* tests/Bug_3912_Regression_Test.cpp
diff --git a/ACE/tests/Bug_3912_Regression_Test.cpp b/ACE/tests/Bug_3912_Regression_Test.cpp
index 7a42bd5a501..66712fdb0ec 100644
--- a/ACE/tests/Bug_3912_Regression_Test.cpp
+++ b/ACE/tests/Bug_3912_Regression_Test.cpp
@@ -39,6 +39,7 @@ public:
close(u_long flags)
{
*close_called = 1;
+ return 0;
}
private:
diff --git a/ACE/tests/tests.mpc b/ACE/tests/tests.mpc
index 46bb67f3228..0465cd94371 100644
--- a/ACE/tests/tests.mpc
+++ b/ACE/tests/tests.mpc
@@ -1958,7 +1958,6 @@ project(Bug_3334_Regression_Test) : acetest {
project(Bug_3912_Regression_Test) : acetest {
after += Service_Config_Stream_DLL
- libs += Service_Config_Stream_DLL
exename = Bug_3912_Regression_Test
Source_Files {
Bug_3912_Regression_Test.cpp