Skip to content

Commit

Permalink
Bump version.
Browse files Browse the repository at this point in the history
  • Loading branch information
jtv committed Mar 23, 2022
1 parent 551d103 commit ad5e807
Show file tree
Hide file tree
Showing 12 changed files with 87 additions and 86 deletions.
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.7.1
7.7.2
20 changes: 10 additions & 10 deletions configure
Original file line number Diff line number Diff line change
@@ -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 <Jeroen T. Vermeulen>.
#
Expand Down Expand Up @@ -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=''

Expand Down Expand Up @@ -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]...

Expand Down Expand Up @@ -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

Expand Down Expand Up @@ -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.
Expand Down Expand Up @@ -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 $@
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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\\"

Expand Down
2 changes: 1 addition & 1 deletion include/pqxx/doc/mainpage.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
134 changes: 67 additions & 67 deletions include/pqxx/internal/header-pre.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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(<ciso646>)
# include <ciso646>
# endif
#if __has_include(<ciso646>)
# include <ciso646>
#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
Expand All @@ -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
2 changes: 1 addition & 1 deletion include/pqxx/version.hxx
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/field.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
2 changes: 1 addition & 1 deletion src/params.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -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) &
Expand Down
2 changes: 1 addition & 1 deletion src/time.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@

#include <cstdlib>

#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.
Expand Down
2 changes: 1 addition & 1 deletion test/test04.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
#include <cstring>
#include <ctime>

#include <pqxx/internal/header-post.hxx>
#include <pqxx/internal/header-pre.hxx>
#include <pqxx/internal/wait.hxx>
#include <pqxx/internal/header-post.hxx>

#include <pqxx/notification>
#include <pqxx/transaction>
Expand Down
2 changes: 1 addition & 1 deletion test/test87.cxx
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
#include <ctime>
#include <iostream>

#include <pqxx/internal/header-post.hxx>
#include <pqxx/internal/header-pre.hxx>
#include <pqxx/internal/wait.hxx>
#include <pqxx/internal/header-post.hxx>

#include <pqxx/notification>
#include <pqxx/transaction>
Expand Down
2 changes: 1 addition & 1 deletion test/unit/test_notification.cxx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#include <chrono>

#include <pqxx/internal/header-post.hxx>
#include <pqxx/internal/header-pre.hxx>
#include <pqxx/internal/wait.hxx>
#include <pqxx/internal/header-post.hxx>

#include <pqxx/nontransaction>
#include <pqxx/notification>
Expand Down

0 comments on commit ad5e807

Please sign in to comment.