Merge pull request #346 from jwillemsen/jwi-removevcworkaround

Remove workaround for not supported Visual Studio version
RemedyIT · Jan 16, 2024 · 84973e5 · 84973e5
2 parents bf93ca7 + d108153
commit 84973e5
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 12 deletions.
diff --git a/ridlbe/c++11/templates/cli/hdr/interface_post.erb b/ridlbe/c++11/templates/cli/hdr/interface_post.erb
@@ -4,8 +4,7 @@
 %##### Abstract interface #####
 %#
 protected:
-#if (defined (_MSC_VER) && (_MSC_VER < 1910)) || (defined __clang__ && __clang_major__ <= 11)
-  // vc14 has a problem with friend, issue #4015
+#if (defined __clang__ && __clang_major__ <= 11)
   // Clang doesn't support this friend construct, issue #4476
   friend TAOX11_CORBA::abstractbase_traits<<%= cxxname %>>::ref_type
     TAOX11_CORBA::abstractbase_traits<<%= cxxname %>>::narrow (
@@ -15,7 +14,7 @@ protected:
   friend typename TAOX11_CORBA::abstractbase_traits<T>::ref_type
     TAOX11_CORBA::abstractbase_traits<T>::narrow (
       TAOX11_CORBA::abstractbase_reference<TAOX11_CORBA::AbstractBase>);
-#endif /* _MSC_VER < 1910 || clang <= 11 */
+#endif /* clang <= 11 */
 
 %# msvc14.{0|1|2} have a problem with defaulted constructors, issue #4005
 #if defined (_MSC_VER) && (_MSC_VER < 1930)

diff --git a/tao/x11/valuetype/abstract_base.h b/tao/x11/valuetype/abstract_base.h
@@ -55,9 +55,7 @@ namespace TAOX11_NAMESPACE
 
       friend class TAOX11_NAMESPACE::ValueFactory_proxy;
       template <typename T> friend class abstractbase_reference;
-#if (defined (_MSC_VER) && (_MSC_VER < 1910)) || (defined __clang__ && __clang_major__ <= 11)
-      // Visual C++ 14.0 has a problem with the narrow method as friend
-      // so make the full traits a friend, issue #4015
+#if (defined __clang__ && __clang_major__ <= 11)
       // Clang doesn't support this friend construct, issue #4476
       template<typename T>
       friend struct TAOX11_CORBA::abstractbase_traits;

diff --git a/tests/any/basic/client.cpp b/tests/any/basic/client.cpp
@@ -630,18 +630,12 @@ test_any_non_copying (Test::Hello::_ref_type hello)
   TAOX11_TEST_INFO << "Test move insertion operator for std::string" << std::endl;
   CORBA::Any any;
   any<<= std::string("abc"); // std::string &&
-#if !(defined (_MSC_VER) && (_MSC_VER < 1910))
-  // Doesn't work with vc14.0, issue 4009
   any<<= std::move("abc"); // std::string &&
-#endif /* !(_MSC_VER < 1910) */
 
   // Test move insertion operator for std::wstring
   TAOX11_TEST_INFO << "Test move insertion operator for std::wstring" << std::endl;
   any<<= std::wstring(L"abc"); // std::string &&
-#if !(defined (_MSC_VER) && (_MSC_VER < 1910))
-  // Doesn't work with vc14.0, issue 4009
   any<<= std::move(L"abc"); // std::string &&
-#endif /* !(_MSC_VER < 1910) */
 
   // in, out, inout
   TAOX11_TEST_INFO << "Test call TestAny3" << std::endl;