sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Summary:proto: Fix warnings for protoc v3

Browse source 
Changeset 11793:9e7dc6807c35
---------------------------
proto: Fix warnings for protoc v3

protoc v3 introduces a new syntax for proto files and warns when the
syntax is not explicitly stated.

protoc relies on the fact that undefined preprocessor symbols are
explanded to 0 but since we use -Wundef they end up generating
warnings.
This commit is contained in:
Jason Lowe-Power 2017-01-28 13:44:35 +05:30 committed by Sanchayan Maity
parent 3370059668
commit 8056b73511
4 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/proto/SConscript
View file

@ -1,6 +1,6 @@
# -*- mode:python -*- # -*- mode:python -*-
# Copyright (c) 2012 ARM Limited # Copyright (c) 2012,2017 ARM Limited
# All rights reserved. # All rights reserved.
# #
# The license below extends only to copyright in the software and shall # The license below extends only to copyright in the software and shall
@ -45,3 +45,8 @@ if env['HAVE_PROTOBUF']:
ProtoBuf('packet.proto') ProtoBuf('packet.proto')
ProtoBuf('inst.proto') ProtoBuf('inst.proto')
Source('protoio.cc') Source('protoio.cc')
# protoc relies on the fact that undefined preprocessor symbols are
# explanded to 0 but since we use -Wundef they end up generating
# warnings.
env.Append(CCFLAGS='-DPROTOBUF_INLINE_NOT_IN_HEADERS=0')

3
src/proto/inst.proto
View file

@ -1,4 +1,4 @@
// Copyright (c) 2014 ARM Limited // Copyright (c) 2014,2017 ARM Limited
// All rights reserved // All rights reserved
// //
// The license below extends only to copyright in the software and shall // The license below extends only to copyright in the software and shall
@ -35,6 +35,7 @@
// //
// Authors: Ali Saidi // Authors: Ali Saidi
syntax = "proto2";
// Put all the generated messages in a namespace // Put all the generated messages in a namespace
package ProtoMessage; package ProtoMessage;

4
src/proto/inst_dep_record.proto
View file

@ -1,4 +1,4 @@
// Copyright (c) 2013 ARM Limited // Copyright (c) 2013,2017 ARM Limited
// All rights reserved // All rights reserved
// //
// The license below extends only to copyright in the software and shall // The license below extends only to copyright in the software and shall
@ -35,6 +35,8 @@
// //
// Authors: Radhika Jagtap // Authors: Radhika Jagtap
syntax = "proto2";
// Put all the generated messages in a namespace // Put all the generated messages in a namespace
package ProtoMessage; package ProtoMessage;

4
src/proto/packet.proto
View file

@ -1,4 +1,4 @@
// Copyright (c) 2012-2013 ARM Limited // Copyright (c) 2012-2013,2017 ARM Limited
// All rights reserved // All rights reserved
// //
// The license below extends only to copyright in the software and shall // The license below extends only to copyright in the software and shall
@ -35,6 +35,8 @@
// //
// Authors: Andreas Hansson // Authors: Andreas Hansson
syntax = "proto2";
// Put all the generated messages in a namespace // Put all the generated messages in a namespace
package ProtoMessage; package ProtoMessage;