diff options
| -rw-r--r-- | ace/SOCK_Dgram.cpp | 6 | ||||
| -rw-r--r-- | ace/Service_Config.h | 32 | ||||
| -rwxr-xr-x | bin/fuzz.pl | 5 | ||||
| -rw-r--r-- | examples/ASX/Event_Server/Event_Server/event_server.cpp | 2 |
4 files changed, 34 insertions, 11 deletions
diff --git a/ace/SOCK_Dgram.cpp b/ace/SOCK_Dgram.cpp index 1242456356d..13547a6849a 100644 --- a/ace/SOCK_Dgram.cpp +++ b/ace/SOCK_Dgram.cpp @@ -560,9 +560,9 @@ ACE_SOCK_Dgram::set_nic (const ACE_TCHAR *net_if, return -1; } else if (this->ACE_SOCK::set_option (IPPROTO_IP, - IP_MULTICAST_IF, - &(send_mreq.imr_interface), - sizeof send_mreq.imr_interface) == -1) + IP_MULTICAST_IF, + &(send_mreq.imr_interface), + sizeof send_mreq.imr_interface) == -1) { if (!ipv6_mif_set) return -1; diff --git a/ace/Service_Config.h b/ace/Service_Config.h index 9659482692d..303446ba3cf 100644 --- a/ace/Service_Config.h +++ b/ace/Service_Config.h @@ -40,15 +40,35 @@ class ACE_DLL; #if (ACE_USES_CLASSIC_SVC_CONF == 1) #define ACE_DYNAMIC_SERVICE_DIRECTIVE(ident, libpathname, objectclass, parameters) \ - "dynamic " ident " Service_Object * " libpathname ":" objectclass "() \"" parameters "\"" -#define ACE_REMOVE_SERVICE_DIRECTIVE(ident) "remove " ident + ACE_LIB_TEXT ("dynamic ") \ + ACE_LIB_TEXT (ident) \ + ACE_LIB_TEXT (" Service_Object * ") \ + ACE_LIB_TEXT (libpathname) \ + ACE_LIB_TEXT (":") \ + ACE_LIB_TEXT (objectclass) \ + ACE_LIB_TEXT ("() \"") \ + ACE_LIB_TEXT (parameters "\"") +#define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \ + ACE_LIB_TEXT ("remove ") \ + ACE_LIB_TEXT (ident) class ACE_Svc_Conf_Param; #else #define ACE_DYNAMIC_SERVICE_DIRECTIVE(ident, libpathname, objectclass, parameters) \ - "<ACE_Svc_Conf><dynamic id=\"" ident "\" type=\"Service_Object\">" \ - "<initializer path=\"" libpathname "\" init=\"" objectclass "\"" \ - " params=\"" parameters "\"/></dynamic></ACE_Svc_Conf>" -#define ACE_REMOVE_SERVICE_DIRECTIVE(ident) "<ACE_Svc_Conf><remove id=\"" ident "\"></remove></ACE_Svc_Conf>" + ACE_LIB_TEXT ("<ACE_Svc_Conf><dynamic id=\"") \ + ACE_LIB_TEXT (ident) \ + ACE_LIB_TEXT ("\" type=\"Service_Object\">") \ + ACE_LIB_TEXT ("<initializer path=\"") \ + ACE_LIB_TEXT (libpathname) \ + ACE_LIB_TEXT ("\" init=\"") \ + ACE_LIB_TEXT (objectclass) \ + ACE_LIB_TEXT ("\"") \ + ACE_LIB_TEXT (" params=\"") \ + ACE_LIB_TEXT (parameters) + ACE_LIB_TEXT ("\"/></dynamic></ACE_Svc_Conf>") +#define ACE_REMOVE_SERVICE_DIRECTIVE(ident) \ + ACE_LIB_TEXT ("<ACE_Svc_Conf><remove id=\"") \ + ACE_LIB_TEXT (ident) \ + ACE_LIB_TEXT ("\"></remove></ACE_Svc_Conf>") class ACE_XML_Svc_Conf; #endif /* ACE_USES_CLASSIC_SVC_CONF == 1 */ diff --git a/bin/fuzz.pl b/bin/fuzz.pl index 187cd42146b..baa00f1a761 100755 --- a/bin/fuzz.pl +++ b/bin/fuzz.pl @@ -1050,9 +1050,12 @@ sub check_for_ace_check () if ($disable == 0) { if (m/\s*ACE_ENV_(SINGLE_)?ARG_PARAMETER[,\)]/) { + $env_line = $line; + if ($found_env) { + print_error ("Missing ACE_CHECK/ACE_TRY_CHECK for $file ($env_line)"); + } $found_env = 1; $in_func = 1; - $env_line = $line; } if (m/^\s*return/) { diff --git a/examples/ASX/Event_Server/Event_Server/event_server.cpp b/examples/ASX/Event_Server/Event_Server/event_server.cpp index 529c792f2c5..bb1a89445df 100644 --- a/examples/ASX/Event_Server/Event_Server/event_server.cpp +++ b/examples/ASX/Event_Server/Event_Server/event_server.cpp @@ -181,7 +181,7 @@ Event_Server::set_watermarks (void) // Set the high and low water marks appropriately. The water marks // control how much data can be buffered before the queues are // considered "full." - int wm = Options::instance ()->low_water_mark (); + size_t wm = Options::instance ()->low_water_mark (); if (this->event_server_.control (ACE_IO_Cntl_Msg::SET_LWM, &wm) == -1) |