Merge pull request #372 from jwillemsen/master

Added separate configuration file for Visual Studio 2017, no special …

6 files changed, 54 insertions, 22 deletions

diff --git a/ACE/NEWS b/ACE/NEWS
index 613301aada8..4aaab419eb6 100644
--- a/ACE/NEWS
+++ b/ACE/NEWS
@@ -1,6 +1,10 @@
 USER VISIBLE CHANGES BETWEEN ACE-6.4.2 and ACE-6.4.3
 ====================================================
 
+. Enhancements for Visual Studio 2017
+
+. Enhancements for Android
+
 USER VISIBLE CHANGES BETWEEN ACE-6.4.1 and ACE-6.4.2
 ====================================================
 
diff --git a/ACE/ace/config-win32-msvc-15.h b/ACE/ace/config-win32-msvc-15.h
new file mode 100644
index 00000000000..1067638a7bf
--- /dev/null
+++ b/ACE/ace/config-win32-msvc-15.h
@@ -0,0 +1,30 @@
+/* -*- C++ -*- */
+//=============================================================================
+/**
+ *  @file   config-win32-msvc-15.h
+ *
+ *  @brief  Microsoft Visual C++ 15.0 configuration file.
+ *
+ *  This file is the ACE configuration file for Microsoft Visual C++ version 2017.
+ *
+ *  @note Do not include this file directly, include config-win32.h instead.
+ */
+//=============================================================================
+
+#ifndef ACE_CONFIG_WIN32_MSVC_15_H
+#define ACE_CONFIG_WIN32_MSVC_15_H
+#include /**/ "ace/pre.h"
+
+#ifndef ACE_CONFIG_WIN32_H
+#error Use config-win32.h in config.h instead of this header
+#endif /* ACE_CONFIG_WIN32_H */
+
+#ifndef ACE_WIN32_VC15
+#  define ACE_WIN32_VC15
+#endif
+
+// Until we have specific msvc15 settings, include the msvc12 file
+#include "ace/config-win32-msvc-14.h"
+
+#include /**/ "ace/post.h"
+#endif /* ACE_CONFIG_WIN32_MSVC_15_H */
diff --git a/ACE/ace/config-win32-msvc.h b/ACE/ace/config-win32-msvc.h
index 65973367530..993da2e5298 100644
--- a/ACE/ace/config-win32-msvc.h
+++ b/ACE/ace/config-win32-msvc.h
@@ -38,7 +38,9 @@
 #endif /* _WIN32_WCE */
 
 //FUZZ: disable check_for_msc_ver
-#if (_MSC_VER >= 1900)
+#if (_MSC_VER >= 1910)
+# include "ace/config-win32-msvc-15.h"
+#elif (_MSC_VER >= 1900)
 # include "ace/config-win32-msvc-14.h"
 #elif (_MSC_VER >= 1800)
 # include "ace/config-win32-msvc-12.h"
diff --git a/ACE/bin/make_release.py b/ACE/bin/make_release.py
index d4e6084a3e2..8add6e145c3 100755
--- a/ACE/bin/make_release.py
+++ b/ACE/bin/make_release.py
@@ -888,6 +888,7 @@ def generate_workspaces (stage_dir):
     msvc_exclude_option = ' '
     vc12_option = ' -name_modifier *_vc12 '
     vc14_option = ' -name_modifier *_vc14 '
+    vc15_option = ' -name_modifier *_vc15 '
 
     redirect_option = str ()
     if not opts.verbose:
@@ -902,6 +903,8 @@ def generate_workspaces (stage_dir):
     print "\tGenerating VC14 solutions..."
     ex (mpc_command + " -type vc14 "  + msvc_exclude_option + mpc_option + workers_option + vc14_option + redirect_option)
 
+    print "\tGenerating VC15 solutions..."
+    ex (mpc_command + " -type vc15 "  + msvc_exclude_option + mpc_option + workers_option + vc15_option + redirect_option)
 
     print "\tCorrecting permissions for all generated files..."
     ex ("find ./ -name '*.vc[p,w]' -or -name '*.bmak' -or -name '*.vcproj' -or -name '*.sln' -or -name '*.vcxproj' -or -name '*.filters' -or -name 'GNUmake*' | xargs chmod 0644")
diff --git a/TAO/TAO_IDL/be/be_sequence.cpp b/TAO/TAO_IDL/be/be_sequence.cpp
index 4bed99c0a56..76a067fcad0 100644
--- a/TAO/TAO_IDL/be/be_sequence.cpp
+++ b/TAO/TAO_IDL/be/be_sequence.cpp
@@ -772,21 +772,16 @@ be_sequence::gen_base_class_name (TAO_OutStream *os,
           default:
             if (this->unbounded ())
               {
-                *os << "::TAO::unbounded_value_sequence<" << linebreak
-                    << be_idt << be_idt_nl
-                    << elem->nested_type_name (ctx_scope) << linebreak
-                    << be_uidt_nl
-                    << ">" << be_uidt;
+                *os << "::TAO::unbounded_value_sequence< "
+                    << elem->nested_type_name (ctx_scope)
+                    << ">";
               }
             else
               {
-                *os << "::TAO::bounded_value_sequence<" << linebreak
-                    << be_idt << be_idt_nl
-                    << elem->nested_type_name (ctx_scope) << "," << linebreak
-                    << be_nl
-                    << this->max_size ()->ev ()->u.ulval << linebreak
-                    << be_uidt_nl
-                    << ">" << be_uidt;
+                *os << "::TAO::bounded_value_sequence< "
+                    << elem->nested_type_name (ctx_scope) << ","
+                    << this->max_size ()->ev ()->u.ulval
+                    << ">";
               }
 
             break;
diff --git a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
index fc815750ad8..b9ada482b9c 100644
--- a/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
+++ b/TAO/TAO_IDL/be/be_visitor_sequence/sequence_ch.cpp
@@ -247,7 +247,7 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
           *os << be_nl_2
               << "virtual ::CORBA::ULong length (void) const;"
               << be_nl
-              << "virtual void length ( ::CORBA::ULong);"
+              << "virtual void length (::CORBA::ULong);"
               << be_nl_2
               << "virtual ::CORBA::ULong maximum (void) const;";
         }
@@ -285,14 +285,12 @@ int be_visitor_sequence_ch::visit_sequence (be_sequence *node)
           && !be_global->alt_mapping ())
         {
           *os << be_nl_2
-              << "\n\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl
-              << node->local_name () << " (" << be_idt << be_idt_nl
-              << "::CORBA::ULong length," << be_nl
-              << "const ACE_Message_Block* mb" << be_uidt_nl
-              << ")" << be_uidt_nl
-              << "  : ::TAO::unbounded_value_sequence< ::CORBA::Octet>"
-              << " (length, mb) {}" << "\n"
-              << "#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */";
+              << "\n#if (TAO_NO_COPY_OCTET_SEQUENCES == 1)" << be_nl
+              << node->local_name () << " (::CORBA::ULong length, const ACE_Message_Block* mb)"
+              << be_idt_nl
+              << ": ::TAO::unbounded_value_sequence< ::CORBA::Octet>"
+              << " (length, mb) {}" << be_uidt_nl
+              << "\n#endif /* TAO_NO_COPY_OCTET_SEQUENCE == 1 */";
         }
 
       *os << be_uidt_nl