[Fawkes Git] branch/bschaepers/protoc-3-compatibility: gazebo-msgs: compatibility with protobuf 3

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Wed Dec 21 16:16:06 CET 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, bschaepers/protoc-3-compatibility has been updated
  discards  4cbf0070ea4c084ec18faea857fee258610338f6 (commit)
        to  71ba39c1157515785b28a618544afa647243ec47 (commit)

This update added new revisions after undoing existing revisions.  That is
to say, the old revision is not a strict subset of the new revision.  This
situation occurs when you --force push a change and generate a repository
containing something like this:

 * -- * -- B -- O -- O -- O (4cbf0070ea4c084ec18faea857fee258610338f6)
            \
             N -- N -- N (71ba39c1157515785b28a618544afa647243ec47)

When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.

http://git.fawkesrobotics.org/fawkes.git/bschaepers/protoc-3-compatibility

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 71ba39c1157515785b28a618544afa647243ec47
Author:     Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
AuthorDate: Fri Nov 18 14:13:57 2016 +0100
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Wed Dec 21 16:15:39 2016 +0100

    gazebo-msgs: compatibility with protobuf 3
    
    Adding the syntax statement will silence the warnings with protoc
    version 3.

http://git.fawkesrobotics.org/fawkes.git/commit/71ba39c
http://trac.fawkesrobotics.org/changeset/71ba39c

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------


- *Diffs* -------------------------------------------------------------

- *commit* 71ba39c1157515785b28a618544afa647243ec47 - - - - - - - - - -
Author:  Bjoern Schaepers <bjoern.schaepers at rwth-aachen.de>
Date:    Fri Nov 18 14:13:57 2016 +0100
Subject: gazebo-msgs: compatibility with protobuf 3

 src/plugins/gazebo/msgs/Float.proto                |    1 +
 src/plugins/gazebo/msgs/LightSignalDetection.proto |    4 ++--
 src/plugins/gazebo/msgs/SimTime.proto              |    4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/gazebo/msgs/Float.proto b/src/plugins/gazebo/msgs/Float.proto
index 9763347..207e8b7 100644
--- a/src/plugins/gazebo/msgs/Float.proto
+++ b/src/plugins/gazebo/msgs/Float.proto
@@ -18,6 +18,7 @@
  *  Read the full text in the LICENSE.GPL file in the doc directory.
  */
 
+syntax = "proto2";
 
 package gazsim_msgs;
 
diff --git a/src/plugins/gazebo/msgs/LightSignalDetection.proto b/src/plugins/gazebo/msgs/LightSignalDetection.proto
index fc2f02e..7630b4b 100644
--- a/src/plugins/gazebo/msgs/LightSignalDetection.proto
+++ b/src/plugins/gazebo/msgs/LightSignalDetection.proto
@@ -18,7 +18,7 @@
  *  Read the full text in the LICENSE.GPL file in the doc directory.
  */
 
-
+syntax = "proto2";
 
 package gazsim_msgs;
 
@@ -53,4 +53,4 @@ message LightSignalDetection {
   repeated LightSpec lights = 2;
   // How long has the light been visible and steady?
   required int32 visibility_history = 3;
- }
\ No newline at end of file
+ }
diff --git a/src/plugins/gazebo/msgs/SimTime.proto b/src/plugins/gazebo/msgs/SimTime.proto
index 0355d27..973a924 100644
--- a/src/plugins/gazebo/msgs/SimTime.proto
+++ b/src/plugins/gazebo/msgs/SimTime.proto
@@ -18,6 +18,8 @@
  *  Read the full text in the LICENSE.GPL file in the doc directory.
  */
 
+syntax = "proto2";
+
 package gazsim_msgs;
 
 message SimTime {
@@ -30,4 +32,4 @@ message SimTime {
   required int64 sim_time_nsec = 2;
   required float real_time_factor = 3;
   required bool paused = 4;
-}
\ No newline at end of file
+}




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list