Skip to content

Use partitions on Poco module to simplify module API #5268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mikomikotaishi wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Use partitions on Poco module to simplify module API #5268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
da011fd
Remove macro guards from `Poco` module
mikomikotaishi Mar 25, 2026
1c68cc0
Use partitions instead of full modules
mikomikotaishi Mar 25, 2026
5c604fa
Merge branch 'pocoproject:main' into no-macro-guard-modules
mikomikotaishi Apr 1, 2026
9c5567b
Restore the recommendations for include guards
mikomikotaishi Apr 1, 2026
da78726
Merge branch 'pocoproject:main' into no-macro-guard-modules
mikomikotaishi Apr 8, 2026
cf63429
Foundation doesn't need macro checks; move Dynamic into Foundation
mikomikotaishi Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions modules/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,17 @@ set(POCO_MODULES
Poco.cppm
)

if(ENABLE_FOUNDATION)
list(APPEND POCO_MODULES
Poco/Foundation.cppm
Poco/Dynamic.cppm
)
list(APPEND POCO_MODULES
Poco/Foundation.cppm
)

target_compile_definitions(Modules PUBLIC ENABLE_FOUNDATION)
target_compile_definitions(Modules PUBLIC ENABLE_FOUNDATION)

target_link_libraries(Modules PUBLIC Poco::Foundation)
if(ENABLE_ENCODINGS)
target_compile_definitions(Modules PUBLIC ENABLE_ENCODINGS)
target_link_libraries(Modules PUBLIC Poco::Foundation)
if(ENABLE_ENCODINGS)
target_compile_definitions(Modules PUBLIC ENABLE_ENCODINGS)

target_link_libraries(Modules PUBLIC Poco::Encodings)
endif()
target_link_libraries(Modules PUBLIC Poco::Encodings)
endif()

if(ENABLE_ACTIVERECORD)
Expand Down
11 changes: 11 additions & 0 deletions modules/CppUnit.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
//
// CppUnit.cppm
//
// C++ module file
//
// Copyright (c) 2025, Applied Informatics Software Engineering GmbH.
// and Contributors.
//
// SPDX-License-Identifier: BSL-1.0
//

module;

#ifdef ENABLE_CPPUNIT
Expand Down
40 changes: 18 additions & 22 deletions modules/Poco.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,57 +11,53 @@

export module Poco;

#ifdef ENABLE_FOUNDATION
export import Poco.Foundation;
#endif
export import :Foundation;

#ifdef ENABLE_ACTIVERECORD
export import Poco.ActiveRecord;
export import :ActiveRecord;
#endif
#ifdef ENABLE_CPPPARSER
export import Poco.CppParser;
export import :CppParser;
#endif
#ifdef ENABLE_CRYPTO
export import Poco.Crypto;
export import :Crypto;
#endif
#ifdef ENABLE_DNSSD
export import Poco.DNSSD;
export import :DNSSD;
#endif
#ifdef ENABLE_DATA
export import Poco.Data;
#endif
#ifdef ENABLE_DYNAMIC
export import Poco.Dynamic;
export import :Data;
#endif
#ifdef ENABLE_JSON
export import Poco.JSON;
export import :JSON;
#endif
#ifdef ENABLE_JWT
export import Poco.JWT;
export import :JWT;
#endif
#ifdef ENABLE_MONGODB
export import Poco.MongoDB;
export import :MongoDB;
#endif
#ifdef ENABLE_NET
export import Poco.Net;
export import :Net;
#endif
#ifdef ENABLE_PDF
export import Poco.PDF;
export import :PDF;
#endif
#ifdef ENABLE_PROMETHEUS
export import Poco.Prometheus;
export import :Prometheus;
#endif
#ifdef ENABLE_REDIS
export import Poco.Redis;
export import :Redis;
#endif
#ifdef ENABLE_SEVENZIP
export import Poco.SevenZip;
export import :SevenZip;
#endif
#ifdef ENABLE_UTIL
export import Poco.Util;
export import :Util;
#endif
#ifdef ENABLE_XML
export import Poco.XML;
export import :XML;
#endif
#ifdef ENABLE_ZIP
export import Poco.Zip;
export import :Zip;
#endif
2 changes: 1 addition & 1 deletion modules/Poco/ActiveRecord.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module;
#include "Poco/ActiveRecord/StatementPlaceholderProvider.h"
#endif

export module Poco.ActiveRecord;
export module Poco:ActiveRecord;

export namespace Poco::ActiveRecord {
#ifdef ENABLE_ACTIVERECORD
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/CppParser.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module;
#include "Poco/CppParser/Variable.h"
#endif

export module Poco.CppParser;
export module Poco:CppParser;

export namespace Poco::CppParser {
#ifdef ENABLE_CPPPARSER
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/Crypto.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ module;
#include "Poco/Crypto/X509Certificate.h"
#endif

export module Poco.Crypto;
export module Poco:Crypto;

export namespace Poco::Crypto {
#ifdef ENABLE_CRYPTO
Expand Down
6 changes: 3 additions & 3 deletions modules/Poco/DNSSD.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@ module;
#include "Poco/DNSSD/Service.h"
#endif

export module Poco.DNSSD;
export module Poco:DNSSD;

#ifdef ENABLE_DNSSD_AVAHI
export import :Avahi;
export import :DNSSD.Avahi;
#endif
#ifdef ENABLE_DNSSD_BONJOUR
export import :Bonjour;
export import :DNSSD.Bonjour;
#endif

export namespace Poco::DNSSD {
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/DNSSD/Avahi.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module;
#include "Poco/DNSSD/Avahi/AvahiResponderImpl.h"
#endif

export module Poco.DNSSD:Avahi;
export module Poco:DNSSD.Avahi;

export namespace Poco::DNSSD {
#ifdef ENABLE_DNSSD
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/DNSSD/Bonjour.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module;
#include "Poco/DNSSD/Bonjour/EventLoop.h"
#endif

export module Poco.DNSSD:Bonjour;
export module Poco:DNSSD.Bonjour;

export namespace Poco::DNSSD {
#ifdef ENABLE_DNSSD
Expand Down
10 changes: 5 additions & 5 deletions modules/Poco/Data.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,19 @@ module;
#include "Poco/Data/TypeHandler.h"
#endif

export module Poco.Data;
export module Poco:Data;

#ifdef ENABLE_DATA_MYSQL
export import :MySQL;
export import :Data.MySQL;
#endif
#ifdef ENABLE_DATA_ODBC
export import :ODBC;
export import :Data.ODBC;
#endif
#ifdef ENABLE_DATA_POSTGRESQL
export import :PostgreSQL;
export import :Data.PostgreSQL;
#endif
#ifdef ENABLE_DATA_SQLITE
export import :SQLite;
export import :Data.SQLite;
#endif

export namespace Poco::Data {
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/Data/MySQL.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ module;
#include "Poco/Data/MySQL/Utility.h"
#endif

export module Poco.Data:MySQL;
export module Poco:Data.MySQL;

export namespace Poco::Data::MySQL {
#ifdef ENABLE_DATA_MYSQL
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/Data/ODBC.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module;
#include "Poco/Data/ODBC/Utility.h"
#endif

export module Poco.Data:ODBC;
export module Poco:Data.ODBC;

export namespace Poco::Data::ODBC {
#ifdef ENABLE_DATA_ODBC
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/Data/PostgreSQL.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ module;
#include "Poco/Data/PostgreSQL/Utility.h"
#endif

export module Poco.Data:PostgreSQL;
export module Poco:Data.PostgreSQL;

export namespace Poco::Data::PostgreSQL {
#ifdef ENABLE_DATA_POSTGRESQL
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/Data/SQLite.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ module;
#include "Poco/Data/SQLite/Utility.h"
#endif

export module Poco.Data:SQLite;
export module Poco:Data.SQLite;

export namespace Poco::Data::SQLite {
#ifdef ENABLE_DATA_SQLITE
Expand Down
64 changes: 0 additions & 64 deletions modules/Poco/Dynamic.cppm
View file
Open in desktop

This file was deleted.

52 changes: 47 additions & 5 deletions modules/Poco/Foundation.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

module;

#ifdef ENABLE_FOUNDATION
#include "Poco/AbstractCache.h"
#include "Poco/AbstractDelegate.h"
#include "Poco/AbstractEvent.h"
Expand Down Expand Up @@ -294,12 +293,17 @@ module;
#ifdef _WIN32
#include "Poco/WindowsConsoleChannel.h"
#endif
#endif

export module Poco.Foundation;
#include "Poco/Dynamic/Pair.h"
#include "Poco/Dynamic/Struct.h"
#include "Poco/Dynamic/Var.h"
#include "Poco/Dynamic/VarHolder.h"
#include "Poco/Dynamic/VarIterator.h"
#include "Poco/Dynamic/VarVisitor.h"

export module Poco:Foundation;

export namespace Poco {
#ifdef ENABLE_FOUNDATION
using Poco::ASCIIEncoding;
using Poco::AbstractCache;
using Poco::AbstractDelegate;
Expand Down Expand Up @@ -853,5 +857,43 @@ export namespace Poco {
using Poco::Impl::Ptr;
using Poco::Impl::hashCombine;
}
#endif

namespace Dynamic {
using Poco::Dynamic::Pair;
using Poco::Dynamic::Struct;
using Poco::Dynamic::Var;
using Poco::Dynamic::VarHolder;
using Poco::Dynamic::VarHolderImpl;
using Poco::Dynamic::VarIterator;
using Poco::Dynamic::Visitor;

using Poco::Dynamic::Array;
using Poco::Dynamic::Deque;
using Poco::Dynamic::List;
using Poco::Dynamic::Vector;

using Poco::Dynamic::operator!=;
using Poco::Dynamic::operator*;
using Poco::Dynamic::operator*=;
using Poco::Dynamic::operator+;
using Poco::Dynamic::operator+=;
using Poco::Dynamic::operator-;
using Poco::Dynamic::operator-=;
using Poco::Dynamic::operator/;
using Poco::Dynamic::operator/=;
using Poco::Dynamic::operator<;
using Poco::Dynamic::operator<=;
using Poco::Dynamic::operator==;
using Poco::Dynamic::operator>;
using Poco::Dynamic::operator>=;
using Poco::Dynamic::structToString;

namespace Impl {
using Poco::Dynamic::Impl::appendJSONKey;
using Poco::Dynamic::Impl::appendJSONString;
using Poco::Dynamic::Impl::appendJSONValue;
using Poco::Dynamic::Impl::containerToJSON;
using Poco::Dynamic::Impl::isJSONString;
}
}
}
2 changes: 1 addition & 1 deletion modules/Poco/JSON.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module;
#include "Poco/JSON/Template.h"
#endif

export module Poco.JSON;
export module Poco:JSON;

export namespace Poco::JSON {
#ifdef ENABLE_JSON
Expand Down
2 changes: 1 addition & 1 deletion modules/Poco/JWT.cppm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ module;
#include "Poco/JWT/Token.h"
#endif

export module Poco.JWT;
export module Poco:JWT;

export namespace Poco::JWT {
#ifdef ENABLE_JWT
Expand Down
Loading
Loading