From ad5e8077c9ffefcb97c4152a113a6cb6f89c6826 Mon Sep 17 00:00:00 2001 From: "Jeroen T. Vermeulen" Date: Thu, 24 Mar 2022 00:17:06 +0100 Subject: [PATCH] Bump version. --- NEWS | 1 + VERSION | 2 +- configure | 20 ++-- include/pqxx/doc/mainpage.md | 2 +- include/pqxx/internal/header-pre.hxx | 134 +++++++++++++-------------- include/pqxx/version.hxx | 2 +- src/field.cxx | 2 +- src/params.cxx | 2 +- src/time.cxx | 2 +- test/test04.cxx | 2 +- test/test87.cxx | 2 +- test/unit/test_notification.cxx | 2 +- 12 files changed, 87 insertions(+), 86 deletions(-) diff --git a/NEWS b/NEWS index 048eb3ab4..d83255677 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,4 @@ +7.7.2 7.7.1 - Don't try to set C++ version in `configure`. User can set compiler options. - Finally fix a long-standing silly warning in autogen. diff --git a/VERSION b/VERSION index 5942a0d3a..fca85800c 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.7.1 +7.7.2 diff --git a/configure b/configure index 251452233..685ef9564 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for libpqxx 7.7.1. +# Generated by GNU Autoconf 2.69 for libpqxx 7.7.2. # # Report bugs to . # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='libpqxx' PACKAGE_TARNAME='libpqxx' -PACKAGE_VERSION='7.7.1' -PACKAGE_STRING='libpqxx 7.7.1' +PACKAGE_VERSION='7.7.2' +PACKAGE_STRING='libpqxx 7.7.2' PACKAGE_BUGREPORT='Jeroen T. Vermeulen' PACKAGE_URL='' @@ -1361,7 +1361,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures libpqxx 7.7.1 to adapt to many kinds of systems. +\`configure' configures libpqxx 7.7.2 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1432,7 +1432,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of libpqxx 7.7.1:";; + short | recursive ) echo "Configuration of libpqxx 7.7.2:";; esac cat <<\_ACEOF @@ -1558,7 +1558,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -libpqxx configure 7.7.1 +libpqxx configure 7.7.2 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2048,7 +2048,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by libpqxx $as_me 7.7.1, which was +It was created by libpqxx $as_me 7.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2915,7 +2915,7 @@ fi # Define the identity of the package. PACKAGE='libpqxx' - VERSION='7.7.1' + VERSION='7.7.2' cat >>confdefs.h <<_ACEOF @@ -18411,7 +18411,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libpqxx $as_me 7.7.1, which was +This file was extended by libpqxx $as_me 7.7.2, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18477,7 +18477,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -libpqxx config.status 7.7.1 +libpqxx config.status 7.7.2 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff --git a/include/pqxx/doc/mainpage.md b/include/pqxx/doc/mainpage.md index d1716b270..13ffcc1d6 100644 --- a/include/pqxx/doc/mainpage.md +++ b/include/pqxx/doc/mainpage.md @@ -1,7 +1,7 @@ libpqxx {#mainpage} ======= -@version 7.7.1 +@version 7.7.2 @author Jeroen T. Vermeulen @see http://pqxx.org @see https://github.com/jtv/libpqxx diff --git a/include/pqxx/internal/header-pre.hxx b/include/pqxx/internal/header-pre.hxx index 09715a329..abc1a398d 100644 --- a/include/pqxx/internal/header-pre.hxx +++ b/include/pqxx/internal/header-pre.hxx @@ -43,75 +43,75 @@ #if defined(PQXX_HEADER_PRE) -#error "Avoid nesting #include of pqxx/internal/header-pre.hxx." +# error "Avoid nesting #include of pqxx/internal/header-pre.hxx." #endif #define PQXX_HEADER_PRE // Workarounds & definitions that need to be included even in library's headers -# include "pqxx/config-public-compiler.h" +#include "pqxx/config-public-compiler.h" // Enable ISO-646 alternative operaotr representations: "and" instead of "&&" // etc. on older compilers. C++20 removes this header. -# if __has_include() -# include -# endif +#if __has_include() +# include +#endif -# if defined(PQXX_HAVE_GCC_PURE) +#if defined(PQXX_HAVE_GCC_PURE) /// Declare function "pure": no side effects, only reads globals and its args. -# define PQXX_PURE __attribute__((pure)) -# else -# define PQXX_PURE /* pure */ -# endif +# define PQXX_PURE __attribute__((pure)) +#else +# define PQXX_PURE /* pure */ +#endif -# if defined(__GNUC__) +#if defined(__GNUC__) /// Tell the compiler to optimise a function for size, not speed. -# define PQXX_COLD __attribute__((cold)) -# else -# define PQXX_COLD /* cold */ -# endif +# define PQXX_COLD __attribute__((cold)) +#else +# define PQXX_COLD /* cold */ +#endif // Workarounds for Windows -# ifdef _WIN32 +#ifdef _WIN32 /* For now, export DLL symbols if _DLL is defined. This is done automatically * by the compiler when linking to the dynamic version of the runtime library, * according to "gzh" */ -# if defined(PQXX_SHARED) && !defined(PQXX_LIBEXPORT) -# define PQXX_LIBEXPORT __declspec(dllimport) -# endif // PQXX_SHARED && !PQXX_LIBEXPORT +# if defined(PQXX_SHARED) && !defined(PQXX_LIBEXPORT) +# define PQXX_LIBEXPORT __declspec(dllimport) +# endif // PQXX_SHARED && !PQXX_LIBEXPORT // Workarounds for Microsoft Visual C++ -# ifdef _MSC_VER +# ifdef _MSC_VER // Suppress vtables on abstract classes. -# define PQXX_NOVTABLE __declspec(novtable) +# define PQXX_NOVTABLE __declspec(novtable) // Automatically link with the appropriate libpq (static or dynamic, debug or // release). The default is to use the release DLL. Define PQXX_PQ_STATIC to // link to a static version of libpq, and _DEBUG to link to a debug version. // The two may be combined. -# if defined(PQXX_AUTOLINK) -# if defined(PQXX_PQ_STATIC) -# ifdef _DEBUG -# pragma comment(lib, "libpqd") -# else -# pragma comment(lib, "libpq") -# endif +# if defined(PQXX_AUTOLINK) +# if defined(PQXX_PQ_STATIC) +# ifdef _DEBUG +# pragma comment(lib, "libpqd") # else -# ifdef _DEBUG -# pragma comment(lib, "libpqddll") -# else -# pragma comment(lib, "libpqdll") -# endif +# pragma comment(lib, "libpq") +# endif +# else +# ifdef _DEBUG +# pragma comment(lib, "libpqddll") +# else +# pragma comment(lib, "libpqdll") # endif # endif +# endif // If we're not compiling libpqxx itself, automatically link with the // appropriate libpqxx library. To link with the libpqxx DLL, define @@ -121,49 +121,49 @@ // The preprocessor macro PQXX_INTERNAL is used to detect whether we // are compiling the libpqxx library itself. When you compile the library // yourself using your own project file, make sure to include this macro. -# if defined(PQXX_AUTOLINK) && !defined(PQXX_INTERNAL) -# ifdef PQXX_SHARED -# ifdef _DEBUG -# pragma comment(lib, "libpqxxD") -# else -# pragma comment(lib, "libpqxx") -# endif -# else // !PQXX_SHARED -# ifdef _DEBUG -# pragma comment(lib, "libpqxx_staticD") -# else -# pragma comment(lib, "libpqxx_static") -# endif +# if defined(PQXX_AUTOLINK) && !defined(PQXX_INTERNAL) +# ifdef PQXX_SHARED +# ifdef _DEBUG +# pragma comment(lib, "libpqxxD") +# else +# pragma comment(lib, "libpqxx") +# endif +# else // !PQXX_SHARED +# ifdef _DEBUG +# pragma comment(lib, "libpqxx_staticD") +# else +# pragma comment(lib, "libpqxx_static") # endif # endif +# endif -# endif // _MSC_VER +# endif // _MSC_VER -# elif defined(PQXX_HAVE_GCC_VISIBILITY) // !_WIN32 +#elif defined(PQXX_HAVE_GCC_VISIBILITY) // !_WIN32 -# define PQXX_LIBEXPORT __attribute__((visibility("default"))) -# define PQXX_PRIVATE __attribute__((visibility("hidden"))) +# define PQXX_LIBEXPORT __attribute__((visibility("default"))) +# define PQXX_PRIVATE __attribute__((visibility("hidden"))) -# endif // PQXX_HAVE_GCC_VISIBILITY +#endif // PQXX_HAVE_GCC_VISIBILITY -# ifndef PQXX_LIBEXPORT -# define PQXX_LIBEXPORT /* libexport */ -# endif +#ifndef PQXX_LIBEXPORT +# define PQXX_LIBEXPORT /* libexport */ +#endif -# ifndef PQXX_PRIVATE -# define PQXX_PRIVATE /* private */ -# endif +#ifndef PQXX_PRIVATE +# define PQXX_PRIVATE /* private */ +#endif -# ifndef PQXX_NOVTABLE -# define PQXX_NOVTABLE /* novtable */ -# endif +#ifndef PQXX_NOVTABLE +# define PQXX_NOVTABLE /* novtable */ +#endif // C++20: Assume support. -# if defined(PQXX_HAVE_LIKELY) -# define PQXX_LIKELY [[likely]] -# define PQXX_UNLIKELY [[unlikely]] -# else -# define PQXX_LIKELY /* [[likely]] */ -# define PQXX_UNLIKELY /* [[unlikely]] */ -# endif +#if defined(PQXX_HAVE_LIKELY) +# define PQXX_LIKELY [[likely]] +# define PQXX_UNLIKELY [[unlikely]] +#else +# define PQXX_LIKELY /* [[likely]] */ +# define PQXX_UNLIKELY /* [[unlikely]] */ +#endif diff --git a/include/pqxx/version.hxx b/include/pqxx/version.hxx index cae5d9e7b..41705dc2a 100644 --- a/include/pqxx/version.hxx +++ b/include/pqxx/version.hxx @@ -15,7 +15,7 @@ # endif /// Full libpqxx version string. -# define PQXX_VERSION "7.7.1" +# define PQXX_VERSION "7.7.2" /// Library ABI version. # define PQXX_ABI "7.7" diff --git a/src/field.cxx b/src/field.cxx index 7dcde11ce..f5026ced2 100644 --- a/src/field.cxx +++ b/src/field.cxx @@ -14,8 +14,8 @@ #include "pqxx/internal/header-pre.hxx" -#include "pqxx/internal/libpq-forward.hxx" #include "pqxx/field.hxx" +#include "pqxx/internal/libpq-forward.hxx" #include "pqxx/result.hxx" #include "pqxx/row.hxx" diff --git a/src/params.cxx b/src/params.cxx index 1308dd0ec..39508327b 100644 --- a/src/params.cxx +++ b/src/params.cxx @@ -8,9 +8,9 @@ */ #include "pqxx-source.hxx" +#include "pqxx/internal/header-post.hxx" #include "pqxx/internal/header-pre.hxx" #include "pqxx/params.hxx" -#include "pqxx/internal/header-post.hxx" void pqxx::internal::c_params::reserve(std::size_t n) & diff --git a/src/time.cxx b/src/time.cxx index bc6925f3a..d3177919b 100644 --- a/src/time.cxx +++ b/src/time.cxx @@ -4,9 +4,9 @@ #include +#include "pqxx/internal/header-post.hxx" #include "pqxx/internal/header-pre.hxx" #include "pqxx/time.hxx" -#include "pqxx/internal/header-post.hxx" // std::chrono::year_month_day is C++20, so let's worry a bit less about C++17 // compatibility in this file. diff --git a/test/test04.cxx b/test/test04.cxx index fe19b85f1..6e3e09d42 100644 --- a/test/test04.cxx +++ b/test/test04.cxx @@ -3,9 +3,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/test/test87.cxx b/test/test87.cxx index bd83501dc..8de314345 100644 --- a/test/test87.cxx +++ b/test/test87.cxx @@ -5,9 +5,9 @@ #include #include +#include #include #include -#include #include #include diff --git a/test/unit/test_notification.cxx b/test/unit/test_notification.cxx index ef6e79869..6f5820954 100644 --- a/test/unit/test_notification.cxx +++ b/test/unit/test_notification.cxx @@ -1,8 +1,8 @@ #include +#include #include #include -#include #include #include