From 0b29baf5deaa4213c08ee71fa55d3d0b2ed709e4 Mon Sep 17 00:00:00 2001
From: Petteri Aimonen <jpa@git.mail.kapsi.fi>
Date: Sat, 12 Sep 2015 15:45:37 +0300
Subject: Make the generator understand included files (issue #165).

This will allow message sizes and enum options to be available
across the include files.

Currently searching for .options files for included files may
not work for all path combinations, this is related to issue #116.
Should probably make a pull request to protoc about that.
---
 tests/multiple_files/multifile2.proto | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'tests/multiple_files/multifile2.proto')

diff --git a/tests/multiple_files/multifile2.proto b/tests/multiple_files/multifile2.proto
index c5dcd406..66cb8a0b 100644
--- a/tests/multiple_files/multifile2.proto
+++ b/tests/multiple_files/multifile2.proto
@@ -9,8 +9,7 @@ message Callback2Message {
 
 message OneofMessage {
     oneof msgs {
-        TestMessage tstmsg = 1;
-        SubMessage submsg = 2;
+        StaticMessage tstmsg = 1;
     }
 }
 
-- 
cgit 1.2.3-korg