Get headers under control, at last.

Fold `compiler-public.hxx` into `header-pre.hxx`. Make all internal `#include`s use the `.hxx` versions of the headers. Forbid nesting of `header-pre.hxx`/`header-post.hxx`. This should make things a bit more regular and easier to understand, apart from the fact that libpqxx code now sets a bad example for including the `<pqxx/*>`-style headers, because internally it uses the `<pqxx/*.hxx>`-style ones. It may save a bit of compile time as well. One thing I still expect to go wrong: it looks as if clang-tidy reorders includes that are not separated by blank lines, alphabetically. That's great, except things like `header-pre.hxx` and `header-post.hxx` get put in weird places and that explains a lot of the trouble I've run into.
jtv · Mar 19, 2022 · 20fc436 · 20fc436
1 parent 345049d
commit 20fc436
Show file tree

Hide file tree

Showing 111 changed files with 378 additions and 383 deletions.
diff --git a/include/Makefile.am b/include/Makefile.am
@@ -38,7 +38,6 @@ nobase_include_HEADERS= pqxx/pqxx \
 	pqxx/version pqxx/version.hxx \
 	pqxx/internal/array-composite.hxx \
 	pqxx/internal/callgate.hxx \
-	pqxx/internal/compiler-public.hxx \
 	pqxx/internal/concat.hxx \
 	pqxx/internal/conversions.hxx \
 	pqxx/internal/encoding_group.hxx \

diff --git a/include/Makefile.in b/include/Makefile.in
@@ -387,7 +387,6 @@ nobase_include_HEADERS = pqxx/pqxx \
 	pqxx/version pqxx/version.hxx \
 	pqxx/internal/array-composite.hxx \
 	pqxx/internal/callgate.hxx \
-	pqxx/internal/compiler-public.hxx \
 	pqxx/internal/concat.hxx \
 	pqxx/internal/conversions.hxx \
 	pqxx/internal/encoding_group.hxx \

diff --git a/include/pqxx/array b/include/pqxx/array
@@ -2,8 +2,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/array.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/array.hxx b/include/pqxx/array.hxx
@@ -11,17 +11,17 @@
 #ifndef PQXX_H_ARRAY
 #define PQXX_H_ARRAY
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 
-#include "pqxx/internal/encoding_group.hxx"
-#include "pqxx/internal/encodings.hxx"
-
 #include <stdexcept>
 #include <string>
 #include <utility>
 
+#include "pqxx/internal/encoding_group.hxx"
+#include "pqxx/internal/encodings.hxx"
+
 
 namespace pqxx
 {

diff --git a/include/pqxx/binarystring b/include/pqxx/binarystring
@@ -2,8 +2,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/binarystring.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/binarystring.hxx b/include/pqxx/binarystring.hxx
@@ -11,7 +11,7 @@
 #ifndef PQXX_H_BINARYSTRING
 #define PQXX_H_BINARYSTRING
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/blob b/include/pqxx/blob
@@ -2,8 +2,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/blob.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/blob.hxx b/include/pqxx/blob.hxx
@@ -13,7 +13,7 @@
 #ifndef PQXX_H_BLOB
 #define PQXX_H_BLOB
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/composite b/include/pqxx/composite
@@ -2,8 +2,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/composite.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/composite.hxx b/include/pqxx/composite.hxx
@@ -1,7 +1,7 @@
 #ifndef PQXX_H_COMPOSITE
 #define PQXX_H_COMPOSITE
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/connection b/include/pqxx/connection
@@ -4,8 +4,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/connection.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/connection.hxx b/include/pqxx/connection.hxx
@@ -13,7 +13,7 @@
 #ifndef PQXX_H_CONNECTION
 #define PQXX_H_CONNECTION
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/cursor b/include/pqxx/cursor
@@ -4,8 +4,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/cursor.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/cursor.hxx b/include/pqxx/cursor.hxx
@@ -13,7 +13,7 @@
 #ifndef PQXX_H_CURSOR
 #define PQXX_H_CURSOR
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/dbtransaction b/include/pqxx/dbtransaction
@@ -4,8 +4,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/dbtransaction.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/dbtransaction.hxx b/include/pqxx/dbtransaction.hxx
@@ -13,7 +13,7 @@
 #ifndef PQXX_H_DBTRANSACTION
 #define PQXX_H_DBTRANSACTION
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/errorhandler b/include/pqxx/errorhandler
@@ -4,8 +4,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/errorhandler.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/errorhandler.hxx b/include/pqxx/errorhandler.hxx
@@ -13,7 +13,7 @@
 #ifndef PQXX_H_ERRORHANDLER
 #define PQXX_H_ERRORHANDLER
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/except b/include/pqxx/except
@@ -4,8 +4,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/except.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/except.hxx b/include/pqxx/except.hxx
@@ -13,7 +13,7 @@
 #ifndef PQXX_H_EXCEPT
 #define PQXX_H_EXCEPT
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/field b/include/pqxx/field
@@ -4,8 +4,5 @@
  */
 // Actual definitions in .hxx file so editors and such recognize file type.
 #include "pqxx/internal/header-pre.hxx"
-#include "pqxx/internal/compiler-public.hxx"
-
 #include "pqxx/field.hxx"
-
 #include "pqxx/internal/header-post.hxx"
diff --git a/include/pqxx/field.hxx b/include/pqxx/field.hxx
@@ -13,7 +13,7 @@
 #ifndef PQXX_H_FIELD
 #define PQXX_H_FIELD
 
-#if !defined(PQXX_H_COMPILER_PUBLIC)
+#if !defined(PQXX_HEADER_PRE)
 #  error "Include libpqxx headers as <pqxx/header>, not <pqxx/header.hxx>."
 #endif
 

diff --git a/include/pqxx/internal/compiler-public.hxx b/include/pqxx/internal/compiler-public.hxx
diff --git a/include/pqxx/internal/gates/connection-notification_receiver.hxx b/include/pqxx/internal/gates/connection-notification_receiver.hxx
@@ -1,6 +1,6 @@
 #include <pqxx/internal/callgate.hxx>
 
-#include <pqxx/connection>
+#include "pqxx/connection.hxx"
 
 
 namespace pqxx

diff --git a/include/pqxx/internal/gates/connection-pipeline.hxx b/include/pqxx/internal/gates/connection-pipeline.hxx
@@ -1,6 +1,8 @@
 #include "pqxx/internal/libpq-forward.hxx"
 #include <pqxx/internal/callgate.hxx>
 
+#include "pqxx/pipeline.hxx"
+
 namespace pqxx::internal::gate
 {
 class PQXX_PRIVATE connection_pipeline : callgate<connection>

diff --git a/include/pqxx/internal/gates/connection-stream_to.hxx b/include/pqxx/internal/gates/connection-stream_to.hxx
@@ -1,5 +1,8 @@
 #include <pqxx/internal/callgate.hxx>
 
+#include "pqxx/stream_to.hxx"
+
+
 namespace pqxx::internal::gate
 {
 class PQXX_PRIVATE connection_stream_to : callgate<connection>

diff --git a/include/pqxx/internal/gates/transaction-transaction_focus.hxx b/include/pqxx/internal/gates/transaction-transaction_focus.hxx
@@ -1,5 +1,7 @@
 #include <pqxx/internal/callgate.hxx>
 
+#include "pqxx/transaction_base.hxx"
+
 namespace pqxx::internal::gate
 {
 class PQXX_PRIVATE transaction_transaction_focus : callgate<transaction_base>

diff --git a/include/pqxx/internal/header-post.hxx b/include/pqxx/internal/header-post.hxx
@@ -14,3 +14,5 @@
 #if defined(_MSC_VER)
 #  pragma warning(pop) // Restore compiler's warning state
 #endif
+
+#undef PQXX_HEADER_PRE