From: Jens Geyer <jensg@apache.org>
Date: Sun, 22 Jun 2014 17:09:06 +0000 (+0200)
Subject: THRIFT-2503 C++: Fix name collision when a struct has a member named "val"
X-Git-Url: https://source.supwisdom.com/gerrit/gitweb?a=commitdiff_plain;h=9999f5295e0c70443a5a5e5f206c87797cae56b0;p=common%2Fthrift.git

THRIFT-2503 C++: Fix name collision when a struct has a member named "val"
Client: C++
Patch: Jens Geyer & Alexander Potashev
---

diff --git a/compiler/cpp/src/generate/t_cpp_generator.cc b/compiler/cpp/src/generate/t_cpp_generator.cc
index c171a53f..825937b5 100755
--- a/compiler/cpp/src/generate/t_cpp_generator.cc
+++ b/compiler/cpp/src/generate/t_cpp_generator.cc
@@ -1175,7 +1175,7 @@ void t_cpp_generator::generate_struct_definition(ofstream& out,
 	out << " val) {" << endl;
       }
       indent_up();
-      out << indent() << (*m_iter)->get_name() << " = val;" << endl;
+      out << indent() << "this->" << (*m_iter)->get_name() << " = val;" << endl;
       indent_down();
 
       // assume all fields are required except optional fields.