summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2012-03-28 21:48:17 +0000
committerSteve Huston <shuston@riverace.com>2012-03-28 21:48:17 +0000
commit54e25c35a91b41ecf6853517d34a7e3dbaec9547 (patch)
tree93ec3c5500f8b6e120c6f6e087b636765607d34a
parenteef1624c1e75259637b1cbb04140f6665f763568 (diff)
downloadATCD-54e25c35a91b41ecf6853517d34a7e3dbaec9547.tar.gz
ChangeLogTag:Wed Mar 28 21:44:20 UTC 2012 Steve Huston <shuston@riverace.com>
-rw-r--r--ACE/ChangeLog6
-rw-r--r--ACE/tests/Multicast_Test.cpp4
2 files changed, 7 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 96f1ef83369..bc5c96f8cdb 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,9 @@
+Wed Mar 28 21:44:20 UTC 2012 Steve Huston <shuston@riverace.com>
+
+ * tests/Multicast_Test.cpp: Removed the forced set_nic to "lo" for
+ Linux. It's not needed with the changes from:
+ Wed Mar 21 21:57:40 UTC 2012 Steve Huston <shuston@riverace.com>
+
Mon Mar 26 11:27:11 UTC 2012 Johnny Willemsen <jwillemsen@remedy.nl>
* include/makeinclude/platform_mingw32.GNU:
diff --git a/ACE/tests/Multicast_Test.cpp b/ACE/tests/Multicast_Test.cpp
index fd712fe4bbe..a053676b1c2 100644
--- a/ACE/tests/Multicast_Test.cpp
+++ b/ACE/tests/Multicast_Test.cpp
@@ -797,9 +797,7 @@ int producer (MCT_Config &config)
ACE_DEBUG ((LM_INFO, ACE_TEXT ("Starting producer...\n")));
ACE_SOCK_Dgram socket (ACE_sap_any_cast (ACE_INET_Addr &), PF_INET);
//FUZZ: enable check_for_lack_ACE_OS
-#if defined (ACE_LINUX)
- socket.set_nic (ACE_TEXT("lo"));
-#endif
+
// Note that is is IPv4 specific and needs to be changed once
//
if (config.ttl () > 1)