From f7b77826e493ce272daf5b1fe8b2143a818134c9 Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Sun, 22 Mar 2020 07:47:10 +0100 Subject: [PATCH] Disable deprecated optimize_for = LITE_RUNTIME option. Fixes warnings with protobuf >= 3.8.0: > The optimize_for = LITE_RUNTIME option is no longer supported by protobuf > Java code generator and is ignored--protoc will always generate full > runtime code for Java. To use Java Lite runtime, users should use the > Java Lite plugin instead. See: > https://github.com/protocolbuffers/protobuf/blob/master/java/lite.md --- src/fileformat.proto | 2 +- src/osmformat.proto | 2 +- tools/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/fileformat.proto b/src/fileformat.proto index 21e670a..89a56da 100644 --- a/src/fileformat.proto +++ b/src/fileformat.proto @@ -8,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI */ -option optimize_for = LITE_RUNTIME; +//option optimize_for = LITE_RUNTIME; option java_package = "crosby.binary"; package OSMPBF; diff --git a/src/osmformat.proto b/src/osmformat.proto index e59bab7..05425e8 100644 --- a/src/osmformat.proto +++ b/src/osmformat.proto @@ -8,7 +8,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI */ -option optimize_for = LITE_RUNTIME; +//option optimize_for = LITE_RUNTIME; option java_package = "crosby.binary"; package OSMPBF; diff --git a/tools/Makefile b/tools/Makefile index 547906c..1c8f2da 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -5,7 +5,7 @@ CXX ?= g++ CXXFLAGS ?= -g CXXFLAGS += -I../include -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -Wall -Wextra -pedantic -Wredundant-decls -Wdisabled-optimization -Wctor-dtor-privacy -Wnon-virtual-dtor -Woverloaded-virtual -Wsign-promo -Wno-long-long -LDFLAGS += -L../src -pthread -lz -lprotobuf-lite -losmpbf +LDFLAGS += -L../src -pthread -lz -lprotobuf -losmpbf .PHONY: clean install