[thrift] branch master updated: Fixes #5500, uncompilable code when a .thirft struct named 'System' is present

[je...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

jensg pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/thrift.git


The following commit(s) were added to refs/heads/master by this push:
     new 86763a1  Fixes #5500, uncompilable code when a .thirft struct named 'System' is present
86763a1 is described below

commit 86763a1681638eb5adaf33d1dd7d7143824bae2c
Author: Jonas Marty <jo...@konplan.com>
AuthorDate: Thu Jan 20 14:58:23 2022 +0100

    Fixes #5500, uncompilable code when a .thirft struct named 'System' is present
---
 compiler/cpp/src/thrift/generate/t_netstd_generator.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
index 1f8e169..9c87df4 100644
--- a/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
+++ b/compiler/cpp/src/thrift/generate/t_netstd_generator.cc
@@ -1794,7 +1794,7 @@ void t_netstd_generator::generate_netstd_struct_equals(ostream& out, t_struct* t
         }
         else
         {
-            out << "System.Object.Equals(";
+            out << "global::System.Object.Equals(";
         }
         out << prop_name((*f_iter)) << ", other." << prop_name((*f_iter)) << ")";
         if (!field_is_required((*f_iter)))