Updated Branches:
  refs/heads/master 691a16ac0 -> a5cce17a8

THRIFT-1958 C#: Use static Object.Equals instead of .Equals() calls in equals

Patch: Carl Yeksigian


Project: http://git-wip-us.apache.org/repos/asf/thrift/repo
Commit: http://git-wip-us.apache.org/repos/asf/thrift/commit/a5cce17a
Tree: http://git-wip-us.apache.org/repos/asf/thrift/tree/a5cce17a
Diff: http://git-wip-us.apache.org/repos/asf/thrift/diff/a5cce17a

Branch: refs/heads/master
Commit: a5cce17a8d77673f9fc339899cf0e040238d20cc
Parents: 691a16a
Author: Jens Geyer <[email protected]>
Authored: Mon May 27 23:55:56 2013 +0200
Committer: Jens Geyer <[email protected]>
Committed: Mon May 27 23:55:56 2013 +0200

----------------------------------------------------------------------
 compiler/cpp/src/generate/t_csharp_generator.cc |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/thrift/blob/a5cce17a/compiler/cpp/src/generate/t_csharp_generator.cc
----------------------------------------------------------------------
diff --git a/compiler/cpp/src/generate/t_csharp_generator.cc 
b/compiler/cpp/src/generate/t_csharp_generator.cc
index 90336a6..a1041fd 100644
--- a/compiler/cpp/src/generate/t_csharp_generator.cc
+++ b/compiler/cpp/src/generate/t_csharp_generator.cc
@@ -1076,10 +1076,11 @@ void 
t_csharp_generator::generate_csharp_struct_equals(ofstream& out, t_struct*
     }
     t_type* ttype = (*f_iter)->get_type();
     if (ttype->is_container()) {
-      out << "TCollections.Equals(" << prop_name((*f_iter)) << ", other." << 
prop_name((*f_iter)) << ")";
+      out << "TCollections.Equals(";
     } else {
-      out << prop_name((*f_iter)) << ".Equals(other." << prop_name((*f_iter)) 
<< ")";
+      out << "System.Object.Equals(";
     }
+    out << prop_name((*f_iter)) << ", other." << prop_name((*f_iter)) << ")";
     if (!field_is_required((*f_iter)) && !(nullable_ && 
!field_has_default((*f_iter)))) {
       out << ")))";
     }

Reply via email to