From 147fbb42852570db1ace0725c6664b24e480f504 Mon Sep 17 00:00:00 2001
From: Maor Itzkovitch <maor.tt@gmail.com>
Date: Mon, 13 Jul 2015 20:00:48 +0300
Subject: [PATCH] builder.put statements now use correct argument names

---
 src/idl_gen_general.cpp        | 2 +-
 tests/MyGame/Example/Vec3.cs   | 6 +++---
 tests/MyGame/Example/Vec3.java | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/idl_gen_general.cpp b/src/idl_gen_general.cpp
index fa84ceef55a..a5b7af77c95 100644
--- a/src/idl_gen_general.cpp
+++ b/src/idl_gen_general.cpp
@@ -481,7 +481,7 @@ static void GenStructBody(const LanguageParameters &lang,
     }
     if (IsStruct(field.value.type)) {
       GenStructBody(lang, *field.value.type.struct_def, code_ptr,
-                    (field.value.type.struct_def->name + "_").c_str());
+                    (nameprefix + (field.name + "_")).c_str());
     } else {
       code += "    builder." + FunctionStart(lang, 'P') + "ut";
       code += GenMethod(lang, field.value.type) + "(";
diff --git a/tests/MyGame/Example/Vec3.cs b/tests/MyGame/Example/Vec3.cs
index 8206118065c..732f2d65f4c 100644
--- a/tests/MyGame/Example/Vec3.cs
+++ b/tests/MyGame/Example/Vec3.cs
@@ -16,13 +16,13 @@ public sealed class Vec3 : Struct {
   public Test Test3 { get { return GetTest3(new Test()); } }
   public Test GetTest3(Test obj) { return obj.__init(bb_pos + 26, bb); }
 
-  public static int CreateVec3(FlatBufferBuilder builder, float X, float Y, float Z, double Test1, Color Test2, short Test_A, sbyte Test_B) {
+  public static int CreateVec3(FlatBufferBuilder builder, float X, float Y, float Z, double Test1, Color Test2, short test3_A, sbyte test3_B) {
     builder.Prep(16, 32);
     builder.Pad(2);
     builder.Prep(2, 4);
     builder.Pad(1);
-    builder.PutSbyte(Test_B);
-    builder.PutShort(Test_A);
+    builder.PutSbyte(test3_B);
+    builder.PutShort(test3_A);
     builder.Pad(1);
     builder.PutSbyte((sbyte)(Test2));
     builder.PutDouble(Test1);
diff --git a/tests/MyGame/Example/Vec3.java b/tests/MyGame/Example/Vec3.java
index 77b56972f6e..794eea1d808 100644
--- a/tests/MyGame/Example/Vec3.java
+++ b/tests/MyGame/Example/Vec3.java
@@ -18,13 +18,13 @@ public final class Vec3 extends Struct {
   public Test test3() { return test3(new Test()); }
   public Test test3(Test obj) { return obj.__init(bb_pos + 26, bb); }
 
-  public static int createVec3(FlatBufferBuilder builder, float x, float y, float z, double test1, byte test2, short Test_a, byte Test_b) {
+  public static int createVec3(FlatBufferBuilder builder, float x, float y, float z, double test1, byte test2, short test3_a, byte test3_b) {
     builder.prep(16, 32);
     builder.pad(2);
     builder.prep(2, 4);
     builder.pad(1);
-    builder.putByte(Test_b);
-    builder.putShort(Test_a);
+    builder.putByte(test3_b);
+    builder.putShort(test3_a);
     builder.pad(1);
     builder.putByte(test2);
     builder.putDouble(test1);