Merge branch 'master' of https://github.com/google/flatbuffers

2beb985f · Wouter van Oortmerssen · d9fe4e27 · fd97404c · 2beb985f
Commit 2beb985f authored Oct 17, 2016 by Wouter van Oortmerssen
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 2 deletions

schema_interface.h grpc/src/compiler/schema_interface.h +3 -2

No files found.
--- a/grpc/src/compiler/schema_interface.h
+++ b/grpc/src/compiler/schema_interface.h
@@ -34,8 +34,9 @@
 #ifndef GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H
 #define GRPC_INTERNAL_COMPILER_SCHEMA_INTERFACE_H

- #include <memory>
- #include <vector>
+#include <map>
+#include <memory>
+#include <vector>

 #ifndef GRPC_CUSTOM_STRING
 #include <string>