summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-03 09:45:49 +0000
committersma <sma@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2008-04-03 09:45:49 +0000
commit2d2b7a4f458b8a8fe869af39f442721b0a86c0f4 (patch)
tree820b3c6eb8e43d8e66f9f27c84b46c64d7e4fc7b
parentdf02a0fc47551c6d23cedac2820977b39b2ea975 (diff)
downloadATCD-2d2b7a4f458b8a8fe869af39f442721b0a86c0f4.tar.gz
ChangeLogTag: Thu Apr 3 09:40:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com>
-rw-r--r--ACE/ChangeLog8
-rw-r--r--ACE/apps/JAWS/stress_testing/benchd.cpp6
2 files changed, 11 insertions, 3 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 7a7f7873c3e..107b3bbcd7b 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,11 @@
+Thu Apr 3 09:40:00 UTC 2008 Simon Massey <simon dot massey at prismtech dot com>
+
+ * apps/JAWS/stress_testing/benchd.cpp:
+
+ Using "interface" as the descriptive name of a parameter seems to
+ cause VC8 (when building with MFC) to assume you mean a struct type
+ and it raises an incorrect systax error.
+
Thu Apr 3 07:05:57 UTC 2008 Johnny Willemsen <jwillemsen@remedy.nl>
* bin/MakeProjectCreator/templates/gnu.mpd:
diff --git a/ACE/apps/JAWS/stress_testing/benchd.cpp b/ACE/apps/JAWS/stress_testing/benchd.cpp
index f2cf497f2e6..da657813e09 100644
--- a/ACE/apps/JAWS/stress_testing/benchd.cpp
+++ b/ACE/apps/JAWS/stress_testing/benchd.cpp
@@ -37,7 +37,7 @@ class Handle_Events : public ACE_Event_Handler
public:
Handle_Events (u_short udp_port,
const char *ip_addr,
- const char *interface,
+ const char *interface_,
ACE_Reactor &reactor);
~Handle_Events (void);
@@ -115,7 +115,7 @@ Handle_Events::~Handle_Events (void)
Handle_Events::Handle_Events (u_short udp_port,
const char *ip_addr,
- const char *interface,
+ const char *interface_,
ACE_Reactor &reactor)
{
// Create multicast address to listen on.
@@ -124,7 +124,7 @@ Handle_Events::Handle_Events (u_short udp_port,
// subscribe to multicast group.
- if (this->mcast_.subscribe (sockmc_addr, 1, interface) == -1)
+ if (this->mcast_.subscribe (sockmc_addr, 1, interface_) == -1)
ACE_OS::perror ("can't subscribe to multicast group"), ACE_OS::exit (1);
// Disable loopbacks.