Skip to content

Commit

Permalink
Force ISO-646 support in Visual Studio 2017.
Browse files Browse the repository at this point in the history
Apparently this compiler does not support the "and" and "or" keywords
as defined in the C++ standard.  There's a deprecated compatibility
header for these situations.

Fixes #155.
  • Loading branch information
jtv committed Feb 7, 2019
1 parent 847f5b4 commit 9532128
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
6.3.1
- Windows compile fix (CALLBACK is a macro there).
- Work around Visual Studio 2017 not supporting ISO 646.
6.3.0
- New "table stream" classes by Joseph Durel: stream_from/stream_to.
- Support weird characters in more identifiers: cursors, notifcations, etc.
Expand Down
9 changes: 4 additions & 5 deletions include/pqxx/compiler-public.hxx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/** Compiler deficiency workarounds for libpqxx clients.
*
* Copyright (c) 2002-2017, Jeroen T. Vermeulen.
* Copyright (c) 2002-2019, Jeroen T. Vermeulen.
*
* See COPYING for copyright license. If you did not receive a file called
* COPYING with this source code, please notify the distributor of this mistake,
Expand All @@ -12,10 +12,9 @@
// Workarounds & definitions that need to be included even in library's headers
#include "pqxx/config-public-compiler.h"

// Workarounds for SUN Workshop 6
#if defined(__SUNPRO_CC)
#define PQXX_PRIVATE __hidden
#endif // __SUNPRO_CC
// Some compilers, Visual Studio in particular, don't seem to support the
// standard's ISO-646 keywords out of the box.
#include <ciso646>


#if defined(__GNUC__) && defined(PQXX_HAVE_GCC_CONST)
Expand Down

0 comments on commit 9532128

Please sign in to comment.