Hello community, here is the log from the commit of package protobuf-c for openSUSE:Factory checked in at 2018-10-11 11:46:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/protobuf-c (Old) and /work/SRC/openSUSE:Factory/.protobuf-c.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "protobuf-c" Thu Oct 11 11:46:19 2018 rev:13 rq:640054 version:1.3.1 Changes: -------- --- /work/SRC/openSUSE:Factory/protobuf-c/protobuf-c.changes 2018-02-09 15:45:17.512247815 +0100 +++ /work/SRC/openSUSE:Factory/.protobuf-c.new/protobuf-c.changes 2018-10-11 11:46:22.186716718 +0200 @@ -1,0 +2,9 @@ +Fri Oct 5 10:14:36 UTC 2018 - Jan Engelhardt <[email protected]> + +- Update to new upstream release 1.3.1 + * Restore protobuf-2.x compatibility + * Convert uses of protobuf's scoped_ptr.h to C++11 std::unique_ptr, + needed to compile against protobuf 3.6.1. +- Rename %soname to %sover to better reflect its use. + +------------------------------------------------------------------- Old: ---- protobuf-c-1.3.0.tar.gz New: ---- protobuf-c-1.3.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ protobuf-c.spec ++++++ --- /var/tmp/diff_new_pack.bQ7Ywd/_old 2018-10-11 11:46:22.838715888 +0200 +++ /var/tmp/diff_new_pack.bQ7Ywd/_new 2018-10-11 11:46:22.842715883 +0200 @@ -1,7 +1,7 @@ # # spec file for package protobuf-c # -# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2011 Pascal Bleser # # All modifications and additions to the file contributed by third parties @@ -13,18 +13,18 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: protobuf-c -Version: 1.3.0 +Version: 1.3.1 Release: 0 -%define soname 1 +%define sover 1 Summary: C bindings for Google's Protocol Buffers License: BSD-3-Clause Group: Development/Tools/Other -Source: https://github.com/%{name}/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz +Source: https://github.com/protobuf-c/protobuf-c/releases/download/v%{version}/%{name}-%{version}.tar.gz Source99: protobuf-c-rpmlintrc Url: https://github.com/protobuf-c/protobuf-c BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -44,20 +44,18 @@ It uses a modified version of protoc called protoc-c. -%package -n libprotobuf-c%{soname} - +%package -n libprotobuf-c%{sover} Summary: C bindings for Google's Protocol Buffers Group: System/Libraries -%description -n libprotobuf-c%{soname} +%description -n libprotobuf-c%{sover} This package provides a code generator and runtime libraries to use Protocol Buffers from pure C (not C++). %package -n libprotobuf-c-devel - Summary: C bindings for Google's Protocol Buffers Group: Development/Libraries/C and C++ -Requires: libprotobuf-c%{soname} = %{version} +Requires: libprotobuf-c%{sover} = %{version} %description -n libprotobuf-c-devel This package provides a code generator and runtime libraries to use Protocol @@ -89,7 +87,7 @@ %install %if 0 pushd build -%makeinstall +%make_install popd #build %else %make_install @@ -97,8 +95,8 @@ rm "%{buildroot}/%{_libdir}"/*.a rm "%{buildroot}/%{_libdir}"/*.la -%post -n libprotobuf-c%{soname} -p /sbin/ldconfig -%postun -n libprotobuf-c%{soname} -p /sbin/ldconfig +%post -n libprotobuf-c%{sover} -p /sbin/ldconfig +%postun -n libprotobuf-c%{sover} -p /sbin/ldconfig %files %defattr(-,root,root) @@ -106,11 +104,11 @@ %{_bindir}/protoc-c %{_bindir}/protoc-gen-c -%files -n libprotobuf-c%{soname} +%files -n libprotobuf-c%{sover} %defattr(-,root,root) %doc LICENSE -%{_libdir}/libprotobuf-c.so.%{soname} -%{_libdir}/libprotobuf-c.so.%{soname}.* +%{_libdir}/libprotobuf-c.so.%{sover} +%{_libdir}/libprotobuf-c.so.%{sover}.* %files -n libprotobuf-c-devel %defattr(-,root,root) ++++++ protobuf-c-1.3.0.tar.gz -> protobuf-c-1.3.1.tar.gz ++++++ ++++ 6949 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/ChangeLog new/protobuf-c-1.3.1/ChangeLog --- old/protobuf-c-1.3.0/ChangeLog 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/ChangeLog 2018-08-14 06:24:20.000000000 +0200 @@ -1,3 +1,29 @@ +protobuf-c (1.3.1) + + [ Robert Edmonds ] + * Release 1.3.1. + + * Restore protobuf-2.x compatibility (#284, #285). + + * Use xenial and protobuf 3.6.1 in the Travis-CI environment (#332). + + * Convert uses of protobuf's scoped_ptr.h to C++11 std::unique_ptr, needed + to compile against protobuf 3.6.1 (#320, #333). + + * Use AX_CXX_COMPILE_STDCXX macro to enable C++11 support in old compilers + (#312, #317, #327, #334). + + [ Fredrik Gustafsson ] + * Add std:: to some types (#294, #305, #309). + + [ Sam Collinson ] + * Check the return value of int_range_lookup before using as an array index; + it can return -1 (#315). + + [ Matthias Dittrich ] + * Fix compilation on mingw by using explicit protoc --plugin=NAME=PATH syntax + in Makefile.am (#289, #290). + protobuf-c (1.3.0) [ Robert Edmonds ] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/Makefile.am new/protobuf-c-1.3.1/Makefile.am --- old/protobuf-c-1.3.0/Makefile.am 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/Makefile.am 2018-08-14 04:11:41.000000000 +0200 @@ -164,13 +164,13 @@ $(protobuf_LIBS) t/test.pb-c.c t/test.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test.proto - $(AM_V_GEN)@PROTOC@ --plugin=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto + $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test.proto t/test-optimized.pb-c.c t/test-optimized.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-optimized.proto - $(AM_V_GEN)@PROTOC@ --plugin=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto + $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-optimized.proto t/test-full.pb-c.c t/test-full.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-full.proto - $(AM_V_GEN)@PROTOC@ --plugin=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto + $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-full.proto t/test-full.pb.cc t/test-full.pb.h: @PROTOC@ $(top_srcdir)/t/test-full.proto $(AM_V_GEN)@PROTOC@ -I$(top_srcdir) --cpp_out=$(top_builddir) $(top_srcdir)/t/test-full.proto @@ -204,7 +204,7 @@ t/test-proto3.pb-c.c t/test-proto3.pb-c.c t/test-proto3.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/test-proto3.proto - $(AM_V_GEN)@PROTOC@ --plugin=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto + $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/test-proto3.proto BUILT_SOURCES += \ t/test-proto3.pb-c.c t/test-proto3.pb-c.h @@ -227,7 +227,7 @@ t_issue220_issue220_LDADD = \ protobuf-c/libprotobuf-c.la t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue220/issue220.proto - $(AM_V_GEN)@PROTOC@ --plugin=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue220/issue220.proto + $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue220/issue220.proto BUILT_SOURCES += \ t/issue220/issue220.pb-c.c t/issue220/issue220.pb-c.h EXTRA_DIST += \ @@ -244,7 +244,7 @@ t_issue251_issue251_LDADD = \ protobuf-c/libprotobuf-c.la t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h: $(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) $(top_srcdir)/t/issue251/issue251.proto - $(AM_V_GEN)@PROTOC@ --plugin=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue251/issue251.proto + $(AM_V_GEN)@PROTOC@ --plugin=protoc-gen-c=$(top_builddir)/protoc-c/protoc-gen-c$(EXEEXT) -I$(top_srcdir) --c_out=$(top_builddir) $(top_srcdir)/t/issue251/issue251.proto BUILT_SOURCES += \ t/issue251/issue251.pb-c.c t/issue251/issue251.pb-c.h EXTRA_DIST += \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/build-aux/compile new/protobuf-c-1.3.1/build-aux/compile --- old/protobuf-c-1.3.0/build-aux/compile 2017-08-05 23:47:26.000000000 +0200 +++ new/protobuf-c-1.3.1/build-aux/compile 2018-08-14 06:25:29.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Wrapper for compilers which do not understand '-c -o'. -scriptversion=2012-10-14.11; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1999-2014 Free Software Foundation, Inc. +# Copyright (C) 1999-2018 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -255,7 +255,8 @@ echo "compile $scriptversion" exit $? ;; - cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe | \ + icl | *[/\\]icl | icl.exe | *[/\\]icl.exe ) func_cl_wrapper "$@" # Doesn't return... ;; esac @@ -339,9 +340,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/build-aux/missing new/protobuf-c-1.3.1/build-aux/missing --- old/protobuf-c-1.3.0/build-aux/missing 2017-08-05 23:47:26.000000000 +0200 +++ new/protobuf-c-1.3.1/build-aux/missing 2018-08-14 06:25:29.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2013-10-28.13; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 1996-2014 Free Software Foundation, Inc. +# Copyright (C) 1996-2018 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -17,7 +17,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -101,9 +101,9 @@ exit $st fi -perl_URL=http://www.perl.org/ -flex_URL=http://flex.sourceforge.net/ -gnu_software_URL=http://www.gnu.org/software +perl_URL=https://www.perl.org/ +flex_URL=https://github.com/westes/flex +gnu_software_URL=https://www.gnu.org/software program_details () { @@ -207,9 +207,9 @@ exit $st # Local variables: -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/build-aux/test-driver new/protobuf-c-1.3.1/build-aux/test-driver --- old/protobuf-c-1.3.0/build-aux/test-driver 2017-08-05 23:47:26.000000000 +0200 +++ new/protobuf-c-1.3.1/build-aux/test-driver 2018-08-14 06:25:29.000000000 +0200 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2013-07-13.22; # UTC +scriptversion=2018-03-07.03; # UTC -# Copyright (C) 2011-2014 Free Software Foundation, Inc. +# Copyright (C) 2011-2018 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -16,7 +16,7 @@ # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <https://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -140,9 +140,9 @@ # Local Variables: # mode: shell-script # sh-indentation: 2 -# eval: (add-hook 'write-file-hooks 'time-stamp) +# eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-time-zone: "UTC" +# time-stamp-time-zone: "UTC0" # time-stamp-end: "; # UTC" # End: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/build-cmake/CMakeLists.txt new/protobuf-c-1.3.1/build-cmake/CMakeLists.txt --- old/protobuf-c-1.3.0/build-cmake/CMakeLists.txt 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/build-cmake/CMakeLists.txt 2018-08-14 06:24:20.000000000 +0200 @@ -1,6 +1,6 @@ SET(PACKAGE protobuf-c) SET(PACKAGE_NAME protobuf-c) -SET(PACKAGE_VERSION 1.3.0) +SET(PACKAGE_VERSION 1.3.1) CMAKE_MINIMUM_REQUIRED(VERSION 2.8 FATAL_ERROR) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/config.h.in new/protobuf-c-1.3.1/config.h.in --- old/protobuf-c-1.3.0/config.h.in 2017-08-05 23:47:26.000000000 +0200 +++ new/protobuf-c-1.3.1/config.h.in 2018-08-14 06:25:28.000000000 +0200 @@ -3,6 +3,9 @@ /* Define if building universal (internal helper macro) */ #undef AC_APPLE_UNIVERSAL_BUILD +/* define if the compiler supports basic C++11 syntax */ +#undef HAVE_CXX11 + /* Define to 1 if you have the <dlfcn.h> header file. */ #undef HAVE_DLFCN_H diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/configure.ac new/protobuf-c-1.3.1/configure.ac --- old/protobuf-c-1.3.0/configure.ac 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/configure.ac 2018-08-14 06:24:20.000000000 +0200 @@ -1,7 +1,7 @@ AC_PREREQ(2.63) AC_INIT([protobuf-c], - [1.3.0], + [1.3.1], [https://github.com/protobuf-c/protobuf-c/issues], [protobuf-c], [https://github.com/protobuf-c/protobuf-c]) @@ -76,6 +76,8 @@ if test "x$enable_protoc" != "xno"; then AC_LANG_PUSH([C++]) + AX_CXX_COMPILE_STDCXX(11, noext, mandatory) + PKG_CHECK_MODULES([protobuf], [protobuf >= 3.0.0], [proto3_supported=yes], [PKG_CHECK_MODULES([protobuf], [protobuf >= 2.6.0])] diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/m4/ax_cxx_compile_stdcxx.m4 new/protobuf-c-1.3.1/m4/ax_cxx_compile_stdcxx.m4 --- old/protobuf-c-1.3.0/m4/ax_cxx_compile_stdcxx.m4 1970-01-01 01:00:00.000000000 +0100 +++ new/protobuf-c-1.3.1/m4/ax_cxx_compile_stdcxx.m4 2018-08-14 05:12:21.000000000 +0200 @@ -0,0 +1,948 @@ +# =========================================================================== +# https://www.gnu.org/software/autoconf-archive/ax_cxx_compile_stdcxx.html +# =========================================================================== +# +# SYNOPSIS +# +# AX_CXX_COMPILE_STDCXX(VERSION, [ext|noext], [mandatory|optional]) +# +# DESCRIPTION +# +# Check for baseline language coverage in the compiler for the specified +# version of the C++ standard. If necessary, add switches to CXX and +# CXXCPP to enable support. VERSION may be '11' (for the C++11 standard) +# or '14' (for the C++14 standard). +# +# The second argument, if specified, indicates whether you insist on an +# extended mode (e.g. -std=gnu++11) or a strict conformance mode (e.g. +# -std=c++11). If neither is specified, you get whatever works, with +# preference for an extended mode. +# +# The third argument, if specified 'mandatory' or if left unspecified, +# indicates that baseline support for the specified C++ standard is +# required and that the macro should error out if no mode with that +# support is found. If specified 'optional', then configuration proceeds +# regardless, after defining HAVE_CXX${VERSION} if and only if a +# supporting mode is found. +# +# LICENSE +# +# Copyright (c) 2008 Benjamin Kosnik <[email protected]> +# Copyright (c) 2012 Zack Weinberg <[email protected]> +# Copyright (c) 2013 Roy Stogner <[email protected]> +# Copyright (c) 2014, 2015 Google Inc.; contributed by Alexey Sokolov <[email protected]> +# Copyright (c) 2015 Paul Norman <[email protected]> +# Copyright (c) 2015 Moritz Klammler <[email protected]> +# Copyright (c) 2016, 2018 Krzesimir Nowak <[email protected]> +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 10 + +dnl This macro is based on the code from the AX_CXX_COMPILE_STDCXX_11 macro +dnl (serial version number 13). + +AC_DEFUN([AX_CXX_COMPILE_STDCXX], [dnl + m4_if([$1], [11], [ax_cxx_compile_alternatives="11 0x"], + [$1], [14], [ax_cxx_compile_alternatives="14 1y"], + [$1], [17], [ax_cxx_compile_alternatives="17 1z"], + [m4_fatal([invalid first argument `$1' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$2], [], [], + [$2], [ext], [], + [$2], [noext], [], + [m4_fatal([invalid second argument `$2' to AX_CXX_COMPILE_STDCXX])])dnl + m4_if([$3], [], [ax_cxx_compile_cxx$1_required=true], + [$3], [mandatory], [ax_cxx_compile_cxx$1_required=true], + [$3], [optional], [ax_cxx_compile_cxx$1_required=false], + [m4_fatal([invalid third argument `$3' to AX_CXX_COMPILE_STDCXX])]) + AC_LANG_PUSH([C++])dnl + ac_success=no + + m4_if([$2], [noext], [], [dnl + if test x$ac_success = xno; then + for alternative in ${ax_cxx_compile_alternatives}; do + switch="-std=gnu++${alternative}" + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + fi]) + + m4_if([$2], [ext], [], [dnl + if test x$ac_success = xno; then + dnl HP's aCC needs +std=c++11 according to: + dnl http://h21007.www2.hp.com/portal/download/files/unprot/aCxx/PDF_Release_Notes/769149-001.pdf + dnl Cray's crayCC needs "-h std=c++11" + for alternative in ${ax_cxx_compile_alternatives}; do + for switch in -std=c++${alternative} +std=c++${alternative} "-h std=c++${alternative}"; do + cachevar=AS_TR_SH([ax_cv_cxx_compile_cxx$1_$switch]) + AC_CACHE_CHECK(whether $CXX supports C++$1 features with $switch, + $cachevar, + [ac_save_CXX="$CXX" + CXX="$CXX $switch" + AC_COMPILE_IFELSE([AC_LANG_SOURCE([_AX_CXX_COMPILE_STDCXX_testbody_$1])], + [eval $cachevar=yes], + [eval $cachevar=no]) + CXX="$ac_save_CXX"]) + if eval test x\$$cachevar = xyes; then + CXX="$CXX $switch" + if test -n "$CXXCPP" ; then + CXXCPP="$CXXCPP $switch" + fi + ac_success=yes + break + fi + done + if test x$ac_success = xyes; then + break + fi + done + fi]) + AC_LANG_POP([C++]) + if test x$ax_cxx_compile_cxx$1_required = xtrue; then + if test x$ac_success = xno; then + AC_MSG_ERROR([*** A compiler with support for C++$1 language features is required.]) + fi + fi + if test x$ac_success = xno; then + HAVE_CXX$1=0 + AC_MSG_NOTICE([No compiler with C++$1 support was found]) + else + HAVE_CXX$1=1 + AC_DEFINE(HAVE_CXX$1,1, + [define if the compiler supports basic C++$1 syntax]) + fi + AC_SUBST(HAVE_CXX$1) +]) + + +dnl Test body for checking C++11 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_11], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 +) + + +dnl Test body for checking C++14 support + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_14], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 +) + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_17], + _AX_CXX_COMPILE_STDCXX_testbody_new_in_11 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_14 + _AX_CXX_COMPILE_STDCXX_testbody_new_in_17 +) + +dnl Tests for new features in C++11 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_11], [[ + +// If the compiler admits that it is not ready for C++11, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201103L + +#error "This is not a C++11 compiler" + +#else + +namespace cxx11 +{ + + namespace test_static_assert + { + + template <typename T> + struct check + { + static_assert(sizeof(int) <= sizeof(T), "not big enough"); + }; + + } + + namespace test_final_override + { + + struct Base + { + virtual void f() {} + }; + + struct Derived : public Base + { + virtual void f() override {} + }; + + } + + namespace test_double_right_angle_brackets + { + + template < typename T > + struct check {}; + + typedef check<void> single_type; + typedef check<check<void>> double_type; + typedef check<check<check<void>>> triple_type; + typedef check<check<check<check<void>>>> quadruple_type; + + } + + namespace test_decltype + { + + int + f() + { + int a = 1; + decltype(a) b = 2; + return a + b; + } + + } + + namespace test_type_deduction + { + + template < typename T1, typename T2 > + struct is_same + { + static const bool value = false; + }; + + template < typename T > + struct is_same<T, T> + { + static const bool value = true; + }; + + template < typename T1, typename T2 > + auto + add(T1 a1, T2 a2) -> decltype(a1 + a2) + { + return a1 + a2; + } + + int + test(const int c, volatile int v) + { + static_assert(is_same<int, decltype(0)>::value == true, ""); + static_assert(is_same<int, decltype(c)>::value == false, ""); + static_assert(is_same<int, decltype(v)>::value == false, ""); + auto ac = c; + auto av = v; + auto sumi = ac + av + 'x'; + auto sumf = ac + av + 1.0; + static_assert(is_same<int, decltype(ac)>::value == true, ""); + static_assert(is_same<int, decltype(av)>::value == true, ""); + static_assert(is_same<int, decltype(sumi)>::value == true, ""); + static_assert(is_same<int, decltype(sumf)>::value == false, ""); + static_assert(is_same<int, decltype(add(c, v))>::value == true, ""); + return (sumf > 0.0) ? sumi : add(c, v); + } + + } + + namespace test_noexcept + { + + int f() { return 0; } + int g() noexcept { return 0; } + + static_assert(noexcept(f()) == false, ""); + static_assert(noexcept(g()) == true, ""); + + } + + namespace test_constexpr + { + + template < typename CharT > + unsigned long constexpr + strlen_c_r(const CharT *const s, const unsigned long acc) noexcept + { + return *s ? strlen_c_r(s + 1, acc + 1) : acc; + } + + template < typename CharT > + unsigned long constexpr + strlen_c(const CharT *const s) noexcept + { + return strlen_c_r(s, 0UL); + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("1") == 1UL, ""); + static_assert(strlen_c("example") == 7UL, ""); + static_assert(strlen_c("another\0example") == 7UL, ""); + + } + + namespace test_rvalue_references + { + + template < int N > + struct answer + { + static constexpr int value = N; + }; + + answer<1> f(int&) { return answer<1>(); } + answer<2> f(const int&) { return answer<2>(); } + answer<3> f(int&&) { return answer<3>(); } + + void + test() + { + int i = 0; + const int c = 0; + static_assert(decltype(f(i))::value == 1, ""); + static_assert(decltype(f(c))::value == 2, ""); + static_assert(decltype(f(0))::value == 3, ""); + } + + } + + namespace test_uniform_initialization + { + + struct test + { + static const int zero {}; + static const int one {1}; + }; + + static_assert(test::zero == 0, ""); + static_assert(test::one == 1, ""); + + } + + namespace test_lambdas + { + + void + test1() + { + auto lambda1 = [](){}; + auto lambda2 = lambda1; + lambda1(); + lambda2(); + } + + int + test2() + { + auto a = [](int i, int j){ return i + j; }(1, 2); + auto b = []() -> int { return '0'; }(); + auto c = [=](){ return a + b; }(); + auto d = [&](){ return c; }(); + auto e = [a, &b](int x) mutable { + const auto identity = [](int y){ return y; }; + for (auto i = 0; i < a; ++i) + a += b--; + return x + identity(a + b); + }(0); + return a + b + c + d + e; + } + + int + test3() + { + const auto nullary = [](){ return 0; }; + const auto unary = [](int x){ return x; }; + using nullary_t = decltype(nullary); + using unary_t = decltype(unary); + const auto higher1st = [](nullary_t f){ return f(); }; + const auto higher2nd = [unary](nullary_t f1){ + return [unary, f1](unary_t f2){ return f2(unary(f1())); }; + }; + return higher1st(nullary) + higher2nd(nullary)(unary); + } + + } + + namespace test_variadic_templates + { + + template <int...> + struct sum; + + template <int N0, int... N1toN> + struct sum<N0, N1toN...> + { + static constexpr auto value = N0 + sum<N1toN...>::value; + }; + + template <> + struct sum<> + { + static constexpr auto value = 0; + }; + + static_assert(sum<>::value == 0, ""); + static_assert(sum<1>::value == 1, ""); + static_assert(sum<23>::value == 23, ""); + static_assert(sum<1, 2>::value == 3, ""); + static_assert(sum<5, 5, 11>::value == 21, ""); + static_assert(sum<2, 3, 5, 7, 11, 13>::value == 41, ""); + + } + + // http://stackoverflow.com/questions/13728184/template-aliases-and-sfinae + // Clang 3.1 fails with headers of libstd++ 4.8.3 when using std::function + // because of this. + namespace test_template_alias_sfinae + { + + struct foo {}; + + template<typename T> + using member = typename T::member_type; + + template<typename T> + void func(...) {} + + template<typename T> + void func(member<T>*) {} + + void test(); + + void test() { func<foo>(0); } + + } + +} // namespace cxx11 + +#endif // __cplusplus >= 201103L + +]]) + + +dnl Tests for new features in C++14 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_14], [[ + +// If the compiler admits that it is not ready for C++14, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201402L + +#error "This is not a C++14 compiler" + +#else + +namespace cxx14 +{ + + namespace test_polymorphic_lambdas + { + + int + test() + { + const auto lambda = [](auto&&... args){ + const auto istiny = [](auto x){ + return (sizeof(x) == 1UL) ? 1 : 0; + }; + const int aretiny[] = { istiny(args)... }; + return aretiny[0]; + }; + return lambda(1, 1L, 1.0f, '1'); + } + + } + + namespace test_binary_literals + { + + constexpr auto ivii = 0b0000000000101010; + static_assert(ivii == 42, "wrong value"); + + } + + namespace test_generalized_constexpr + { + + template < typename CharT > + constexpr unsigned long + strlen_c(const CharT *const s) noexcept + { + auto length = 0UL; + for (auto p = s; *p; ++p) + ++length; + return length; + } + + static_assert(strlen_c("") == 0UL, ""); + static_assert(strlen_c("x") == 1UL, ""); + static_assert(strlen_c("test") == 4UL, ""); + static_assert(strlen_c("another\0test") == 7UL, ""); + + } + + namespace test_lambda_init_capture + { + + int + test() + { + auto x = 0; + const auto lambda1 = [a = x](int b){ return a + b; }; + const auto lambda2 = [a = lambda1(x)](){ return a; }; + return lambda2(); + } + + } + + namespace test_digit_separators + { + + constexpr auto ten_million = 100'000'000; + static_assert(ten_million == 100000000, ""); + + } + + namespace test_return_type_deduction + { + + auto f(int& x) { return x; } + decltype(auto) g(int& x) { return x; } + + template < typename T1, typename T2 > + struct is_same + { + static constexpr auto value = false; + }; + + template < typename T > + struct is_same<T, T> + { + static constexpr auto value = true; + }; + + int + test() + { + auto x = 0; + static_assert(is_same<int, decltype(f(x))>::value, ""); + static_assert(is_same<int&, decltype(g(x))>::value, ""); + return x; + } + + } + +} // namespace cxx14 + +#endif // __cplusplus >= 201402L + +]]) + + +dnl Tests for new features in C++17 + +m4_define([_AX_CXX_COMPILE_STDCXX_testbody_new_in_17], [[ + +// If the compiler admits that it is not ready for C++17, why torture it? +// Hopefully, this will speed up the test. + +#ifndef __cplusplus + +#error "This is not a C++ compiler" + +#elif __cplusplus < 201703L + +#error "This is not a C++17 compiler" + +#else + +#include <initializer_list> +#include <utility> +#include <type_traits> + +namespace cxx17 +{ + + namespace test_constexpr_lambdas + { + + constexpr int foo = [](){return 42;}(); + + } + + namespace test::nested_namespace::definitions + { + + } + + namespace test_fold_expression + { + + template<typename... Args> + int multiply(Args... args) + { + return (args * ... * 1); + } + + template<typename... Args> + bool all(Args... args) + { + return (args && ...); + } + + } + + namespace test_extended_static_assert + { + + static_assert (true); + + } + + namespace test_auto_brace_init_list + { + + auto foo = {5}; + auto bar {5}; + + static_assert(std::is_same<std::initializer_list<int>, decltype(foo)>::value); + static_assert(std::is_same<int, decltype(bar)>::value); + } + + namespace test_typename_in_template_template_parameter + { + + template<template<typename> typename X> struct D; + + } + + namespace test_fallthrough_nodiscard_maybe_unused_attributes + { + + int f1() + { + return 42; + } + + [[nodiscard]] int f2() + { + [[maybe_unused]] auto unused = f1(); + + switch (f1()) + { + case 17: + f1(); + [[fallthrough]]; + case 42: + f1(); + } + return f1(); + } + + } + + namespace test_extended_aggregate_initialization + { + + struct base1 + { + int b1, b2 = 42; + }; + + struct base2 + { + base2() { + b3 = 42; + } + int b3; + }; + + struct derived : base1, base2 + { + int d; + }; + + derived d1 {{1, 2}, {}, 4}; // full initialization + derived d2 {{}, {}, 4}; // value-initialized bases + + } + + namespace test_general_range_based_for_loop + { + + struct iter + { + int i; + + int& operator* () + { + return i; + } + + const int& operator* () const + { + return i; + } + + iter& operator++() + { + ++i; + return *this; + } + }; + + struct sentinel + { + int i; + }; + + bool operator== (const iter& i, const sentinel& s) + { + return i.i == s.i; + } + + bool operator!= (const iter& i, const sentinel& s) + { + return !(i == s); + } + + struct range + { + iter begin() const + { + return {0}; + } + + sentinel end() const + { + return {5}; + } + }; + + void f() + { + range r {}; + + for (auto i : r) + { + [[maybe_unused]] auto v = i; + } + } + + } + + namespace test_lambda_capture_asterisk_this_by_value + { + + struct t + { + int i; + int foo() + { + return [*this]() + { + return i; + }(); + } + }; + + } + + namespace test_enum_class_construction + { + + enum class byte : unsigned char + {}; + + byte foo {42}; + + } + + namespace test_constexpr_if + { + + template <bool cond> + int f () + { + if constexpr(cond) + { + return 13; + } + else + { + return 42; + } + } + + } + + namespace test_selection_statement_with_initializer + { + + int f() + { + return 13; + } + + int f2() + { + if (auto i = f(); i > 0) + { + return 3; + } + + switch (auto i = f(); i + 4) + { + case 17: + return 2; + + default: + return 1; + } + } + + } + + namespace test_template_argument_deduction_for_class_templates + { + + template <typename T1, typename T2> + struct pair + { + pair (T1 p1, T2 p2) + : m1 {p1}, + m2 {p2} + {} + + T1 m1; + T2 m2; + }; + + void f() + { + [[maybe_unused]] auto p = pair{13, 42u}; + } + + } + + namespace test_non_type_auto_template_parameters + { + + template <auto n> + struct B + {}; + + B<5> b1; + B<'a'> b2; + + } + + namespace test_structured_bindings + { + + int arr[2] = { 1, 2 }; + std::pair<int, int> pr = { 1, 2 }; + + auto f1() -> int(&)[2] + { + return arr; + } + + auto f2() -> std::pair<int, int>& + { + return pr; + } + + struct S + { + int x1 : 2; + volatile double y1; + }; + + S f3() + { + return {}; + } + + auto [ x1, y1 ] = f1(); + auto& [ xr1, yr1 ] = f1(); + auto [ x2, y2 ] = f2(); + auto& [ xr2, yr2 ] = f2(); + const auto [ x3, y3 ] = f3(); + + } + + namespace test_exception_spec_type_system + { + + struct Good {}; + struct Bad {}; + + void g1() noexcept; + void g2(); + + template<typename T> + Bad + f(T*, T*); + + template<typename T1, typename T2> + Good + f(T1*, T2*); + + static_assert (std::is_same_v<Good, decltype(f(g1, g2))>); + + } + + namespace test_inline_variables + { + + template<class T> void f(T) + {} + + template<class T> inline T g(T) + { + return T{}; + } + + template<> inline void f<>(int) + {} + + template<> int g<>(int) + { + return 5; + } + + } + +} // namespace cxx17 + +#endif // __cplusplus < 201703L + +]]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protobuf-c/protobuf-c.c new/protobuf-c-1.3.1/protobuf-c/protobuf-c.c --- old/protobuf-c-1.3.0/protobuf-c/protobuf-c.c 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/protobuf-c/protobuf-c.c 2018-08-14 04:07:48.000000000 +0200 @@ -2239,6 +2239,8 @@ latter_msg->descriptor ->field_ranges, *earlier_case_p); + if (field_index < 0) + return FALSE; field = latter_msg->descriptor->fields + field_index; } else { @@ -2632,6 +2634,8 @@ int_range_lookup(message->descriptor->n_field_ranges, message->descriptor->field_ranges, *oneof_case); + if (field_index < 0) + return FALSE; const ProtobufCFieldDescriptor *old_field = message->descriptor->fields + field_index; size_t el_size = sizeof_elt_in_repeated_array(old_field->type); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protobuf-c/protobuf-c.h new/protobuf-c-1.3.1/protobuf-c/protobuf-c.h --- old/protobuf-c-1.3.0/protobuf-c/protobuf-c.h 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/protobuf-c/protobuf-c.h 2018-08-14 06:24:20.000000000 +0200 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2017, Dave Benson and the protobuf-c authors. + * Copyright (c) 2008-2018, Dave Benson and the protobuf-c authors. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -790,13 +790,13 @@ * The version of the protobuf-c headers, represented as a string using the same * format as protobuf_c_version(). */ -#define PROTOBUF_C_VERSION "1.3.0" +#define PROTOBUF_C_VERSION "1.3.1" /** * The version of the protobuf-c headers, represented as an integer using the * same format as protobuf_c_version_number(). */ -#define PROTOBUF_C_VERSION_NUMBER 1003000 +#define PROTOBUF_C_VERSION_NUMBER 1003001 /** * The minimum protoc-c version which works with the current version of the diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protoc-c/c_field.cc new/protobuf-c-1.3.1/protoc-c/c_field.cc --- old/protobuf-c-1.3.0/protoc-c/c_field.cc 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/protoc-c/c_field.cc 2018-08-14 04:07:48.000000000 +0200 @@ -189,7 +189,7 @@ FieldGeneratorMap::FieldGeneratorMap(const Descriptor* descriptor) : descriptor_(descriptor), field_generators_( - new scoped_ptr<FieldGenerator>[descriptor->field_count()]) { + new std::unique_ptr<FieldGenerator>[descriptor->field_count()]) { // Construct all the FieldGenerators. for (int i = 0; i < descriptor->field_count(); i++) { field_generators_[i].reset(MakeGenerator(descriptor->field(i))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protoc-c/c_field.h new/protobuf-c-1.3.1/protoc-c/c_field.h --- old/protobuf-c-1.3.0/protoc-c/c_field.h 2016-01-30 01:54:28.000000000 +0100 +++ new/protobuf-c-1.3.1/protoc-c/c_field.h 2018-08-14 04:07:48.000000000 +0200 @@ -63,6 +63,7 @@ #ifndef GOOGLE_PROTOBUF_COMPILER_C_FIELD_H__ #define GOOGLE_PROTOBUF_COMPILER_C_FIELD_H__ +#include <memory> #include <google/protobuf/stubs/common.h> #include <google/protobuf/descriptor.h> @@ -117,7 +118,7 @@ private: const Descriptor* descriptor_; - scoped_array<scoped_ptr<FieldGenerator> > field_generators_; + std::unique_ptr<std::unique_ptr<FieldGenerator>[]> field_generators_; static FieldGenerator* MakeGenerator(const FieldDescriptor* field); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protoc-c/c_file.cc new/protobuf-c-1.3.1/protoc-c/c_file.cc --- old/protobuf-c-1.3.0/protoc-c/c_file.cc 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/protoc-c/c_file.cc 2018-08-14 04:07:48.000000000 +0200 @@ -83,13 +83,13 @@ const string& dllexport_decl) : file_(file), message_generators_( - new scoped_ptr<MessageGenerator>[file->message_type_count()]), + new std::unique_ptr<MessageGenerator>[file->message_type_count()]), enum_generators_( - new scoped_ptr<EnumGenerator>[file->enum_type_count()]), + new std::unique_ptr<EnumGenerator>[file->enum_type_count()]), service_generators_( - new scoped_ptr<ServiceGenerator>[file->service_count()]), + new std::unique_ptr<ServiceGenerator>[file->service_count()]), extension_generators_( - new scoped_ptr<ExtensionGenerator>[file->extension_count()]) { + new std::unique_ptr<ExtensionGenerator>[file->extension_count()]) { for (int i = 0; i < file->message_type_count(); i++) { message_generators_[i].reset( @@ -120,9 +120,11 @@ string filename_identifier = FilenameIdentifier(file_->name()); int min_header_version = 1000000; +#if defined(HAVE_PROTO3) if (file_->syntax() == FileDescriptor::SYNTAX_PROTO3) { min_header_version = 1003000; } +#endif // Generate top of header. printer->Print( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protoc-c/c_file.h new/protobuf-c-1.3.1/protoc-c/c_file.h --- old/protobuf-c-1.3.0/protoc-c/c_file.h 2016-01-30 01:54:28.000000000 +0100 +++ new/protobuf-c-1.3.1/protoc-c/c_file.h 2018-08-14 04:07:48.000000000 +0200 @@ -63,6 +63,7 @@ #ifndef GOOGLE_PROTOBUF_COMPILER_C_FILE_H__ #define GOOGLE_PROTOBUF_COMPILER_C_FILE_H__ +#include <memory> #include <string> #include <vector> #include <google/protobuf/stubs/common.h> @@ -98,13 +99,13 @@ private: const FileDescriptor* file_; - scoped_array<scoped_ptr<MessageGenerator> > message_generators_; - scoped_array<scoped_ptr<EnumGenerator> > enum_generators_; - scoped_array<scoped_ptr<ServiceGenerator> > service_generators_; - scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_; + std::unique_ptr<std::unique_ptr<MessageGenerator>[]> message_generators_; + std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_; + std::unique_ptr<std::unique_ptr<ServiceGenerator>[]> service_generators_; + std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_; // E.g. if the package is foo.bar, package_parts_ is {"foo", "bar"}. - vector<string> package_parts_; + std::vector<string> package_parts_; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(FileGenerator); }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protoc-c/c_generator.cc new/protobuf-c-1.3.1/protoc-c/c_generator.cc --- old/protobuf-c-1.3.0/protoc-c/c_generator.cc 2016-01-30 01:54:28.000000000 +0100 +++ new/protobuf-c-1.3.1/protoc-c/c_generator.cc 2018-08-14 04:07:48.000000000 +0200 @@ -62,6 +62,7 @@ #include <protoc-c/c_generator.h> +#include <memory> #include <vector> #include <utility> @@ -80,13 +81,13 @@ // "foo=bar,baz,qux=corge" // parses to the pairs: // ("foo", "bar"), ("baz", ""), ("qux", "corge") -void ParseOptions(const string& text, vector<pair<string, string> >* output) { - vector<string> parts; +void ParseOptions(const string& text, std::vector<std::pair<string, string> >* output) { + std::vector<string> parts; SplitStringUsing(text, ",", &parts); for (unsigned i = 0; i < parts.size(); i++) { string::size_type equals_pos = parts[i].find_first_of('='); - pair<string, string> value; + std::pair<string, string> value; if (equals_pos == string::npos) { value.first = parts[i]; value.second = ""; @@ -105,7 +106,7 @@ const string& parameter, OutputDirectory* output_directory, string* error) const { - vector<pair<string, string> > options; + std::vector<std::pair<string, string> > options; ParseOptions(parameter, &options); // ----------------------------------------------------------------- @@ -149,7 +150,7 @@ // Generate header. { - scoped_ptr<io::ZeroCopyOutputStream> output( + std::unique_ptr<io::ZeroCopyOutputStream> output( output_directory->Open(basename + ".h")); io::Printer printer(output.get(), '$'); file_generator.GenerateHeader(&printer); @@ -157,7 +158,7 @@ // Generate cc file. { - scoped_ptr<io::ZeroCopyOutputStream> output( + std::unique_ptr<io::ZeroCopyOutputStream> output( output_directory->Open(basename + ".c")); io::Printer printer(output.get(), '$'); file_generator.GenerateSource(&printer); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protoc-c/c_helpers.cc new/protobuf-c-1.3.1/protoc-c/c_helpers.cc --- old/protobuf-c-1.3.0/protoc-c/c_helpers.cc 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/protoc-c/c_helpers.cc 2018-08-14 04:07:48.000000000 +0200 @@ -60,6 +60,7 @@ // Modified to implement C code by Dave Benson. +#include <memory> #include <vector> #include <set> #include <stdio.h> // for snprintf @@ -177,7 +178,7 @@ } string FullNameToLower(const string &full_name) { - vector<string> pieces; + std::vector<string> pieces; SplitStringUsing(full_name, ".", &pieces); string rv = ""; for (unsigned i = 0; i < pieces.size(); i++) { @@ -188,7 +189,7 @@ return rv; } string FullNameToUpper(const string &full_name) { - vector<string> pieces; + std::vector<string> pieces; SplitStringUsing(full_name, ".", &pieces); string rv = ""; for (unsigned i = 0; i < pieces.size(); i++) { @@ -199,7 +200,7 @@ return rv; } string FullNameToC(const string &full_name) { - vector<string> pieces; + std::vector<string> pieces; SplitStringUsing(full_name, ".", &pieces); string rv = ""; for (unsigned i = 0; i < pieces.size(); i++) { @@ -214,7 +215,7 @@ { if (!comment.empty()) { - vector<string> comment_lines; + std::vector<string> comment_lines; SplitStringUsing (comment, "\r\n", &comment_lines); printer->Print ("/*\n"); for (int i = 0; i < comment_lines.size(); i++) @@ -503,8 +504,8 @@ void SplitStringUsing(const string& full, const char* delim, - vector<string>* result) { - std::back_insert_iterator< vector<string> > it(*result); + std::vector<string>* result) { + std::back_insert_iterator< std::vector<string> > it(*result); SplitStringToIteratorUsing(full, delim, it); } @@ -559,7 +560,7 @@ } string CEscape(const string& src) { const int dest_length = src.size() * 4 + 1; // Maximum possible expansion - scoped_array<char> dest(new char[dest_length]); + std::unique_ptr<char[]> dest(new char[dest_length]); const int len = CEscapeInternal(src.data(), src.size(), dest.get(), dest_length, false); GOOGLE_DCHECK_GE(len, 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protoc-c/c_message.cc new/protobuf-c-1.3.1/protoc-c/c_message.cc --- old/protobuf-c-1.3.0/protoc-c/c_message.cc 2017-08-05 23:43:57.000000000 +0200 +++ new/protobuf-c-1.3.1/protoc-c/c_message.cc 2018-08-14 04:07:48.000000000 +0200 @@ -62,6 +62,7 @@ #include <algorithm> #include <map> +#include <memory> #include <protoc-c/c_message.h> #include <protoc-c/c_enum.h> #include <protoc-c/c_extension.h> @@ -83,11 +84,11 @@ : descriptor_(descriptor), dllexport_decl_(dllexport_decl), field_generators_(descriptor), - nested_generators_(new scoped_ptr<MessageGenerator>[ + nested_generators_(new std::unique_ptr<MessageGenerator>[ descriptor->nested_type_count()]), - enum_generators_(new scoped_ptr<EnumGenerator>[ + enum_generators_(new std::unique_ptr<EnumGenerator>[ descriptor->enum_type_count()]), - extension_generators_(new scoped_ptr<ExtensionGenerator>[ + extension_generators_(new std::unique_ptr<ExtensionGenerator>[ descriptor->extension_count()]) { for (int i = 0; i < descriptor->nested_type_count(); i++) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/protobuf-c-1.3.0/protoc-c/c_message.h new/protobuf-c-1.3.1/protoc-c/c_message.h --- old/protobuf-c-1.3.0/protoc-c/c_message.h 2016-01-30 01:54:28.000000000 +0100 +++ new/protobuf-c-1.3.1/protoc-c/c_message.h 2018-08-14 04:07:48.000000000 +0200 @@ -63,6 +63,7 @@ #ifndef GOOGLE_PROTOBUF_COMPILER_C_MESSAGE_H__ #define GOOGLE_PROTOBUF_COMPILER_C_MESSAGE_H__ +#include <memory> #include <string> #include <google/protobuf/stubs/common.h> #include <protoc-c/c_field.h> @@ -126,9 +127,9 @@ const Descriptor* descriptor_; string dllexport_decl_; FieldGeneratorMap field_generators_; - scoped_array<scoped_ptr<MessageGenerator> > nested_generators_; - scoped_array<scoped_ptr<EnumGenerator> > enum_generators_; - scoped_array<scoped_ptr<ExtensionGenerator> > extension_generators_; + std::unique_ptr<std::unique_ptr<MessageGenerator>[]> nested_generators_; + std::unique_ptr<std::unique_ptr<EnumGenerator>[]> enum_generators_; + std::unique_ptr<std::unique_ptr<ExtensionGenerator>[]> extension_generators_; GOOGLE_DISALLOW_EVIL_CONSTRUCTORS(MessageGenerator); };
