commit 4ea44ac546c9545e134e65502e2467b08caf2bfa
author Jens Geyer <jensg@apache.org> Fri Jul 19 00:49:03 2024 +0200
committer Jens Geyer <Jens-G@users.noreply.github.com> Fri Jul 19 23:03:21 2024 +0200
tree 91abcd0a1ed2c5f425b4cbde5bdcd6344e36fbb5
parent 1e54480f5ff859434c5521004883a4098a7f2ea0

THRIFT-5797 HashSet() CTOR takes no argument for net < 5
Client: netstd
Patch: Jens Geyer

compiler/cpp/src/thrift/generate/t_netstd_generator.cc

diff --git a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
index a652e19..01ba442 100644
--- a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
@@ -360,7 +360,7 @@
         namespaces += "using System.ServiceModel;\n";
         namespaces += "using System.Runtime.Serialization;\n";
     }
-
+    
     return namespaces;
 }
 
@@ -814,7 +814,11 @@
 
             string suffix("");
             string tmp_instance = tmp("tmp");
-            out << indent() << "var " << tmp_instance << " = new " << iter->first << "(source.Count);" << '\n';
+            if( (target_net_version < 5) && iter->second->is_set()) {
+                out << indent() << "var " << tmp_instance << " = new " << iter->first << "();" << '\n';
+            } else {
+                out << indent() << "var " << tmp_instance << " = new " << iter->first << "(source.Count);" << '\n';                
+            }
             if( iter->second->is_map())
             {
                 t_map* tmap = static_cast<t_map*>(iter->second);
@@ -2864,7 +2868,11 @@
         out << indent() << "var " << obj << " = await iprot.ReadListBeginAsync(" << CANCELLATION_TOKEN_NAME << ");" << '\n';
     }
 
-    out << indent() << prefix << " = new " << type_name(ttype) << "(" << obj << ".Count);" << '\n';
+    if( (target_net_version < 5) && ttype->is_set()) {
+        out << indent() << prefix << " = new " << type_name(ttype) << "();" << '\n';
+    } else {
+        out << indent() << prefix << " = new " << type_name(ttype) << "(" << obj << ".Count);" << '\n';
+    }
     string i = tmp("_i");
     out << indent() << "for(int " << i << " = 0; " << i << " < " << obj << ".Count; ++" << i << ")" << '\n'
         << indent() << "{" << '\n';