diff options
| -rw-r--r-- | .github/issue_template.md | 45 | ||||
| -rw-r--r-- | ACE/ace/SOCK_Acceptor.cpp | 20 | ||||
| -rw-r--r-- | ACE/bin/MakeProjectCreator/config/bmake.features | 2 | ||||
| -rw-r--r-- | ACE/tests/Compiler_Features_38_Test.cpp | 4 |
4 files changed, 56 insertions, 15 deletions
diff --git a/.github/issue_template.md b/.github/issue_template.md new file mode 100644 index 00000000000..781f4161474 --- /dev/null +++ b/.github/issue_template.md @@ -0,0 +1,45 @@ +### Version + +The version of ACE and/or TAO you are using + +### Host machine and operating system + +### Target machine and operating system (if different from host) + +### Compiler name and version (including patch level) + +### The $ACE_ROOT/ace/config.h file + +If you use a link to a platform-specific file, simply state which one + +### The $ACE_ROOT/include/makeinclude/platform_macros.GNU file + +if you use a link to a platform-specific file, simply state which one (unless this isn't used in this case, e.g., with Microsoft Visual C++) + +### Contents of $ACE_ROOT/bin/MakeProjectCreator/config/default.features + +Used by MPC when you generate your own makefiles + +### AREA/CLASS/EXAMPLE AFFECTED: + +What example failed? What module failed to compile? + +### The problem effects: + +Does it affect compilation, linking, or execution. Please indicate whether ACE/TAO, your application, or both are affected. + +### Synopsis + +Brief description of the problem + +### Description + +Detailed description of problem. Don't just say "<blah> doesn't work, here's a fix," explain what your program does to get to the <blah> state. + +### Repeat by + +What you did to get the error; include test program or session transcript if at all possible. + +### Sample fix/ workaround + +If available diff --git a/ACE/ace/SOCK_Acceptor.cpp b/ACE/ace/SOCK_Acceptor.cpp index 12311129ee0..47057df08d3 100644 --- a/ACE/ace/SOCK_Acceptor.cpp +++ b/ACE/ace/SOCK_Acceptor.cpp @@ -227,7 +227,7 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap, ACE_TRACE ("ACE_SOCK_Acceptor::shared_open"); int error = 0; -#if !defined (ACE_HAS_IPV6) || (!defined (IPPROTO_IPV6) || !defined (IPV6_V6ONLY)) +#if !defined (ACE_HAS_IPV6) ACE_UNUSED_ARG (ipv6_only); #else /* defined (ACE_HAS_IPV6) */ if (protocol_family == PF_INET6) @@ -253,7 +253,6 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap, * This must be done before attempting to bind the address. * On Windows older than Vista this will fail. */ -# if defined (IPPROTO_IPV6) && defined (IPV6_V6ONLY) int setting = !!ipv6_only; if (-1 == ACE_OS::setsockopt (this->get_handle (), IPPROTO_IPV6, @@ -262,17 +261,16 @@ ACE_SOCK_Acceptor::shared_open (const ACE_Addr &local_sap, sizeof (setting))) error = 1; else -# endif /* IPPROTO_V6 && IPV6_ONLY */ - // We probably don't need a bind_port written here. - // There are currently no supported OS's that define - // ACE_LACKS_WILDCARD_BIND. - if (ACE_OS::bind (this->get_handle (), - reinterpret_cast<sockaddr *> (&local_inet6_addr), - sizeof local_inet6_addr) == -1) - error = 1; + // We probably don't need a bind_port written here. + // There are currently no supported OS's that define + // ACE_LACKS_WILDCARD_BIND. + if (ACE_OS::bind (this->get_handle (), + reinterpret_cast<sockaddr *> (&local_inet6_addr), + sizeof local_inet6_addr) == -1) + error = 1; } else -#endif +#endif /* ACE_HAS_IPV6 */ if (protocol_family == PF_INET) { sockaddr_in local_inet_addr; diff --git a/ACE/bin/MakeProjectCreator/config/bmake.features b/ACE/bin/MakeProjectCreator/config/bmake.features index f7f24def9d1..fa48614c377 100644 --- a/ACE/bin/MakeProjectCreator/config/bmake.features +++ b/ACE/bin/MakeProjectCreator/config/bmake.features @@ -1,5 +1,3 @@ -// bmake.features,v 1.2 2005/08/22 09:35:48 jwillemsen Exp - ssl=0 qos=1 cidl=0 diff --git a/ACE/tests/Compiler_Features_38_Test.cpp b/ACE/tests/Compiler_Features_38_Test.cpp index 83733394013..31a02190573 100644 --- a/ACE/tests/Compiler_Features_38_Test.cpp +++ b/ACE/tests/Compiler_Features_38_Test.cpp @@ -6,7 +6,7 @@ #include "test_config.h" // g++ 4.1 can't handle this construct -#if (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 1)) +#if defined (__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ <= 1)) # define ACE_DISABLE_TEST #endif @@ -44,10 +44,10 @@ run_main (int, ACE_TCHAR *[]) Foo2Seq f2; long const j = f2[0].i; ACE_UNUSED_ARG(j); -#endif /* !ACE_DISABLE_TEST */ ACE_DEBUG ((LM_INFO, ACE_TEXT ("C++ support ok\n"))); +#endif /* !ACE_DISABLE_TEST */ ACE_END_TEST; |