From 74eea7f1e2fdad7e21e994944b96f277b16c6235 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 8 Aug 2024 09:51:12 -0500 Subject: [PATCH 1/3] CXX-3085 Upgrade to Doxygen 1.12.0 --- docs/DoxygenLayout.xml | 2 +- etc/generate-apidocs-from-tag.pl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/DoxygenLayout.xml b/docs/DoxygenLayout.xml index e3d16643be..755d931f2b 100644 --- a/docs/DoxygenLayout.xml +++ b/docs/DoxygenLayout.xml @@ -8,7 +8,7 @@ - + diff --git a/etc/generate-apidocs-from-tag.pl b/etc/generate-apidocs-from-tag.pl index cbac850714..9bb2c80101 100755 --- a/etc/generate-apidocs-from-tag.pl +++ b/etc/generate-apidocs-from-tag.pl @@ -11,7 +11,7 @@ # The required Doxygen version. # The generated results are sensitive to the release version. -our $doxygen_version_required = "1.11.0"; +our $doxygen_version_required = "1.12.0"; # Allow specifying a custom Doxygen binary via the `$DOXYGEN_BINARY` environment variable. our $doxygen_binary = $ENV{DOXYGEN_BINARY} || "doxygen"; From a2bbacb1cf2dbc1f0aa2cf6279eaab72178e197a Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 8 Aug 2024 09:51:13 -0500 Subject: [PATCH 2/3] docs: remove doc for nonexistent namespace bsoncxx::exception --- src/bsoncxx/include/bsoncxx/doc.hpp | 5 ----- src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp | 5 ----- 2 files changed, 10 deletions(-) diff --git a/src/bsoncxx/include/bsoncxx/doc.hpp b/src/bsoncxx/include/bsoncxx/doc.hpp index 174c944ad0..4d42d18b1d 100644 --- a/src/bsoncxx/include/bsoncxx/doc.hpp +++ b/src/bsoncxx/include/bsoncxx/doc.hpp @@ -64,11 +64,6 @@ /// Declares entities representing a BSON document. /// -/// -/// @namespace bsoncxx::exception -/// Declares entities related to bsoncxx exceptions and error codes. -/// - /// /// @namespace bsoncxx::stdx /// Declares C++17 standard library polyfills. diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp index aee7b3f7c0..7d9e7a2706 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/fwd.hpp @@ -375,11 +375,6 @@ /// @copydoc bsoncxx::document /// -/// -/// @namespace bsoncxx::v_noabi::exception -/// @copydoc bsoncxx::exception -/// - /// /// @namespace bsoncxx::v_noabi::stdx /// @copydoc bsoncxx::stdx From 1f53fac774a3a6bfb09e88dc8249988eb2902b43 Mon Sep 17 00:00:00 2001 From: Ezra Chung Date: Thu, 8 Aug 2024 09:51:14 -0500 Subject: [PATCH 3/3] docs: fix signature of redeclarations of concatenate array overloads --- .../include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp | 4 ++-- .../include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp index 7f58144a1b..9c4bfbc3e9 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/basic/helpers.hpp @@ -57,8 +57,8 @@ namespace basic { /// @ref bsoncxx::v_noabi::builder::concatenate(v_noabi::document::view_or_value doc) v_noabi::concatenate_doc concatenate(v_noabi::document::view_or_value doc); -/// @ref bsoncxx::v_noabi::builder::concatenate(v_noabi::array::view_or_value doc) -v_noabi::concatenate_doc concatenate(v_noabi::array::view_or_value doc); +/// @ref bsoncxx::v_noabi::builder::concatenate(v_noabi::array::view_or_value array) +v_noabi::concatenate_array concatenate(v_noabi::array::view_or_value array); } // namespace basic } // namespace builder diff --git a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp index 036613a93f..b489dab2b6 100644 --- a/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp +++ b/src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/concatenate.hpp @@ -140,8 +140,8 @@ namespace builder { /// @ref bsoncxx::v_noabi::builder::concatenate(v_noabi::document::view_or_value doc) v_noabi::builder::concatenate_doc concatenate(v_noabi::document::view_or_value doc); -/// @ref bsoncxx::v_noabi::builder::concatenate(v_noabi::array::view_or_value doc) -v_noabi::builder::concatenate_doc concatenate(v_noabi::array::view_or_value doc); +/// @ref bsoncxx::v_noabi::builder::concatenate(v_noabi::array::view_or_value array) +v_noabi::builder::concatenate_array concatenate(v_noabi::array::view_or_value array); } // namespace builder } // namespace bsoncxx