From b90d4e049d115f075e026c8173e5baace5b6fafa Mon Sep 17 00:00:00 2001
From: Wouter van Oortmerssen <aardappel@gmail.com>
Date: Wed, 12 Apr 2017 17:56:19 -0700
Subject: [PATCH] VS warning fixes.

Change-Id: I19662241d56560c064cff73dbebfb2a81d226934
---
 src/idl_gen_cpp.cpp  | 1 +
 src/idl_gen_text.cpp | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/idl_gen_cpp.cpp b/src/idl_gen_cpp.cpp
index b5a6c59ac..d821eb402 100644
--- a/src/idl_gen_cpp.cpp
+++ b/src/idl_gen_cpp.cpp
@@ -478,6 +478,7 @@ class CppGenerator : public BaseGenerator {
           : ev.name;
     } else {
       assert(false);
+      return ev.name;
     }
   }
 
diff --git a/src/idl_gen_text.cpp b/src/idl_gen_text.cpp
index cff1b322d..dc445e5c4 100644
--- a/src/idl_gen_text.cpp
+++ b/src/idl_gen_text.cpp
@@ -49,7 +49,7 @@ void OutputIdentifier(const std::string &name, const IDLOptions &opts,
 // for a single FlatBuffer value into JSON format.
 // The general case for scalars:
 template<typename T> bool Print(T val, Type type, int /*indent*/,
-                                Type */*union_type*/,
+                                Type * /*union_type*/,
                                 const IDLOptions &opts,
                                 std::string *_text) {
   std::string &text = *_text;