Fix Windows compile: CALLBACK is a macro there.

Fixes #153.
jtv · Feb 3, 2019 · 847f5b4 · 847f5b4
1 parent d6ffb1a
commit 847f5b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/NEWS b/NEWS
@@ -1,3 +1,5 @@
+6.3.1
+ - Windows compile fix (CALLBACK is a macro there).
 6.3.0
  - New "table stream" classes by Joseph Durel: stream_from/stream_to.
  - Support weird characters in more identifiers: cursors, notifcations, etc.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-6.3.0
+6.3.1
diff --git a/include/pqxx/internal/encodings.hxx b/include/pqxx/internal/encodings.hxx
@@ -73,9 +73,9 @@ PQXX_LIBEXPORT std::string::size_type find_with_encoding(
 /** Scans the glyphs in the buffer, and for each, passes its begin and its
  * one-past-end pointers to @c callback.
  */
-template<typename CALLBACK> PQXX_LIBEXPORT inline void for_glyphs(
+template<typename CALLABLE> PQXX_LIBEXPORT inline void for_glyphs(
         encoding_group enc,
-        CALLBACK callback,
+        CALLABLE callback,
         const char buffer[],
         std::string::size_type buffer_len,
         std::string::size_type start = 0