From 57d3f327ebfb1b15a3373a76c7bd2e446816580d Mon Sep 17 00:00:00 2001 From: Toyosatomimi no Miko <110693261+mikomikotaishi@users.noreply.github.com> Date: Mon, 9 Mar 2026 08:50:20 -0400 Subject: [PATCH 1/6] Use C++17 nested declarations, closes #5234 --- ActiveRecord/Compiler/src/CodeGenerator.cpp | 6 ++--- ActiveRecord/Compiler/src/CodeGenerator.h | 6 ++--- ActiveRecord/Compiler/src/Compiler.cpp | 6 ++--- ActiveRecord/Compiler/src/HeaderGenerator.cpp | 6 ++--- ActiveRecord/Compiler/src/HeaderGenerator.h | 6 ++--- ActiveRecord/Compiler/src/ImplGenerator.cpp | 6 ++--- ActiveRecord/Compiler/src/ImplGenerator.h | 6 ++--- ActiveRecord/Compiler/src/Parser.cpp | 6 ++--- ActiveRecord/Compiler/src/Parser.h | 6 ++--- ActiveRecord/Compiler/src/Types.h | 6 ++--- .../include/Poco/ActiveRecord/ActiveRecord.h | 5 ++-- .../include/Poco/ActiveRecord/Context.h | 5 ++-- .../include/Poco/ActiveRecord/IDTraits.h | 5 ++-- .../include/Poco/ActiveRecord/Query.h | 5 ++-- .../StatementPlaceholderProvider.h | 5 ++-- ActiveRecord/src/ActiveRecord.cpp | 5 ++-- ActiveRecord/src/Context.cpp | 5 ++-- ActiveRecord/src/IDTraits.cpp | 5 ++-- .../src/StatementPlaceholderProvider.cpp | 5 ++-- ActiveRecord/testsuite/include/ORM/Employee.h | 5 ++-- ActiveRecord/testsuite/include/ORM/Role.h | 5 ++-- CppParser/include/Poco/CppParser/Attributes.h | 5 ++-- .../include/Poco/CppParser/AttributesParser.h | 5 ++-- CppParser/include/Poco/CppParser/BuiltIn.h | 5 ++-- CppParser/include/Poco/CppParser/CppToken.h | 5 ++-- CppParser/include/Poco/CppParser/Decl.h | 5 ++-- CppParser/include/Poco/CppParser/Enum.h | 5 ++-- CppParser/include/Poco/CppParser/EnumValue.h | 5 ++-- CppParser/include/Poco/CppParser/Function.h | 5 ++-- CppParser/include/Poco/CppParser/NameSpace.h | 5 ++-- CppParser/include/Poco/CppParser/Parameter.h | 5 ++-- CppParser/include/Poco/CppParser/Parser.h | 5 ++-- CppParser/include/Poco/CppParser/Struct.h | 5 ++-- CppParser/include/Poco/CppParser/Symbol.h | 5 ++-- CppParser/include/Poco/CppParser/Tokenizer.h | 5 ++-- CppParser/include/Poco/CppParser/TypeDef.h | 5 ++-- CppParser/include/Poco/CppParser/Utility.h | 5 ++-- CppParser/include/Poco/CppParser/Variable.h | 5 ++-- CppParser/src/Attributes.cpp | 5 ++-- CppParser/src/AttributesParser.cpp | 5 ++-- CppParser/src/BuiltIn.cpp | 5 ++-- CppParser/src/CppToken.cpp | 5 ++-- CppParser/src/Decl.cpp | 5 ++-- CppParser/src/Enum.cpp | 5 ++-- CppParser/src/EnumValue.cpp | 5 ++-- CppParser/src/Function.cpp | 5 ++-- CppParser/src/NameSpace.cpp | 5 ++-- CppParser/src/Parameter.cpp | 5 ++-- CppParser/src/Parser.cpp | 5 ++-- CppParser/src/Struct.cpp | 5 ++-- CppParser/src/Symbol.cpp | 5 ++-- CppParser/src/Tokenizer.cpp | 5 ++-- CppParser/src/TypeDef.cpp | 5 ++-- CppParser/src/Utility.cpp | 5 ++-- CppParser/src/Variable.cpp | 5 ++-- Crypto/include/Poco/Crypto/Cipher.h | 5 ++-- Crypto/include/Poco/Crypto/CipherFactory.h | 5 ++-- Crypto/include/Poco/Crypto/CipherImpl.h | 5 ++-- Crypto/include/Poco/Crypto/CipherKey.h | 5 ++-- Crypto/include/Poco/Crypto/CipherKeyImpl.h | 5 ++-- Crypto/include/Poco/Crypto/Crypto.h | 5 ++-- Crypto/include/Poco/Crypto/CryptoException.h | 5 ++-- Crypto/include/Poco/Crypto/CryptoStream.h | 5 ++-- Crypto/include/Poco/Crypto/CryptoTransform.h | 5 ++-- Crypto/include/Poco/Crypto/DigestEngine.h | 5 ++-- .../include/Poco/Crypto/ECDSADigestEngine.h | 5 ++-- Crypto/include/Poco/Crypto/ECKey.h | 5 ++-- Crypto/include/Poco/Crypto/ECKeyImpl.h | 5 ++-- Crypto/include/Poco/Crypto/EVPCipherImpl.h | 5 ++-- Crypto/include/Poco/Crypto/EVPPKey.h | 5 ++-- Crypto/include/Poco/Crypto/Envelope.h | 5 ++-- Crypto/include/Poco/Crypto/KeyPair.h | 5 ++-- Crypto/include/Poco/Crypto/KeyPairImpl.h | 5 ++-- .../include/Poco/Crypto/OpenSSLInitializer.h | 5 ++-- Crypto/include/Poco/Crypto/PKCS12Container.h | 5 ++-- Crypto/include/Poco/Crypto/RSACipherImpl.h | 5 ++-- Crypto/include/Poco/Crypto/RSADigestEngine.h | 5 ++-- Crypto/include/Poco/Crypto/RSAKey.h | 5 ++-- Crypto/include/Poco/Crypto/RSAKeyImpl.h | 5 ++-- Crypto/include/Poco/Crypto/X509Certificate.h | 5 ++-- Crypto/src/Cipher.cpp | 5 ++-- Crypto/src/CipherFactory.cpp | 5 ++-- Crypto/src/CipherImpl.cpp | 5 ++-- Crypto/src/CipherKey.cpp | 5 ++-- Crypto/src/CipherKeyImpl.cpp | 5 ++-- Crypto/src/CryptoException.cpp | 5 ++-- Crypto/src/CryptoStream.cpp | 5 ++-- Crypto/src/CryptoTransform.cpp | 5 ++-- Crypto/src/DigestEngine.cpp | 5 ++-- Crypto/src/ECDSADigestEngine.cpp | 5 ++-- Crypto/src/ECKey.cpp | 5 ++-- Crypto/src/ECKeyImpl.cpp | 5 ++-- Crypto/src/EVPCipherImpl.cpp | 5 ++-- Crypto/src/EVPPKey.cpp | 5 ++-- Crypto/src/Envelope.cpp | 5 ++-- Crypto/src/KeyPair.cpp | 5 ++-- Crypto/src/KeyPairImpl.cpp | 5 ++-- Crypto/src/OpenSSLInitializer.cpp | 5 ++-- Crypto/src/PKCS12Container.cpp | 5 ++-- Crypto/src/RSACipherImpl.cpp | 5 ++-- Crypto/src/RSADigestEngine.cpp | 5 ++-- Crypto/src/RSAKey.cpp | 5 ++-- Crypto/src/RSAKeyImpl.cpp | 5 ++-- Crypto/src/X509Certificate.cpp | 5 ++-- DNSSD/Avahi/include/Poco/DNSSD/Avahi/Avahi.h | 5 ++-- .../Poco/DNSSD/Avahi/AvahiBrowserImpl.h | 6 ++--- .../Poco/DNSSD/Avahi/AvahiResponderImpl.h | 6 ++--- DNSSD/Avahi/src/AvahiBrowserImpl.cpp | 6 ++--- DNSSD/Avahi/src/AvahiResponderImpl.cpp | 11 +++----- .../include/Poco/DNSSD/Bonjour/Bonjour.h | 5 ++-- .../Poco/DNSSD/Bonjour/BonjourBrowserImpl.h | 6 ++--- .../Poco/DNSSD/Bonjour/BonjourResponderImpl.h | 6 ++--- .../include/Poco/DNSSD/Bonjour/EventLoop.h | 6 ++--- DNSSD/Bonjour/src/BonjourBrowserImpl.cpp | 6 ++--- DNSSD/Bonjour/src/BonjourResponderImpl.cpp | 11 +++----- DNSSD/Bonjour/src/EventLoop.cpp | 6 ++--- DNSSD/include/Poco/DNSSD/DNSSD.h | 5 ++-- DNSSD/include/Poco/DNSSD/DNSSDBrowser.h | 5 ++-- DNSSD/include/Poco/DNSSD/DNSSDException.h | 5 ++-- DNSSD/include/Poco/DNSSD/DNSSDResponder.h | 5 ++-- DNSSD/include/Poco/DNSSD/DNSSDResponderImpl.h | 5 ++-- DNSSD/include/Poco/DNSSD/Domain.h | 5 ++-- DNSSD/include/Poco/DNSSD/Error.h | 5 ++-- DNSSD/include/Poco/DNSSD/Record.h | 5 ++-- DNSSD/include/Poco/DNSSD/Service.h | 5 ++-- DNSSD/src/DNSSDBrowser.cpp | 5 ++-- DNSSD/src/DNSSDException.cpp | 5 ++-- DNSSD/src/DNSSDResponder.cpp | 5 ++-- DNSSD/src/DNSSDResponderImpl.cpp | 5 ++-- DNSSD/src/Domain.cpp | 5 ++-- DNSSD/src/Error.cpp | 5 ++-- DNSSD/src/Record.cpp | 5 ++-- DNSSD/src/Service.cpp | 5 ++-- .../include/Poco/Data/Test/SQLExecutor.h | 6 ++--- Data/DataTest/src/SQLExecutor.cpp | 5 ++-- Data/MySQL/include/Poco/Data/MySQL/Binder.h | 6 ++--- .../MySQL/include/Poco/Data/MySQL/Connector.h | 6 ++--- .../MySQL/include/Poco/Data/MySQL/Extractor.h | 12 ++++----- .../include/Poco/Data/MySQL/MySQLException.h | 6 ++--- .../Poco/Data/MySQL/MySQLStatementImpl.h | 6 ++--- .../include/Poco/Data/MySQL/ResultMetadata.h | 6 ++--- .../include/Poco/Data/MySQL/SessionHandle.h | 6 ++--- .../include/Poco/Data/MySQL/SessionImpl.h | 6 ++--- .../Poco/Data/MySQL/StatementExecutor.h | 6 ++--- Data/MySQL/include/Poco/Data/MySQL/Utility.h | 6 ++--- Data/MySQL/src/Binder.cpp | 6 ++--- Data/MySQL/src/Connector.cpp | 6 ++--- Data/MySQL/src/Extractor.cpp | 6 ++--- Data/MySQL/src/MySQLException.cpp | 6 ++--- Data/MySQL/src/MySQLStatementImpl.cpp | 6 ++--- Data/MySQL/src/ResultMetadata.cpp | 6 ++--- Data/MySQL/src/SessionHandle.cpp | 6 ++--- Data/MySQL/src/SessionImpl.cpp | 6 ++--- Data/MySQL/src/StatementExecutor.cpp | 6 ++--- Data/MySQL/src/Utility.cpp | 6 ++--- Data/MySQL/testsuite/src/SQLExecutor.cpp | 5 ++-- .../include/Poco/Data/ODBC/ConnectionHandle.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/Connector.h | 6 ++--- .../ODBC/include/Poco/Data/ODBC/Diagnostics.h | 6 ++--- .../Poco/Data/ODBC/EnvironmentHandle.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/Error.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/Extractor.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/Handle.h | 6 ++--- .../include/Poco/Data/ODBC/ODBCException.h | 6 ++--- .../include/Poco/Data/ODBC/ODBCMetaColumn.h | 6 ++--- .../Poco/Data/ODBC/ODBCStatementImpl.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/Parameter.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/Preparator.h | 5 ++-- .../ODBC/include/Poco/Data/ODBC/SessionImpl.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/Unicode.h | 6 ++--- .../include/Poco/Data/ODBC/Unicode_UNIXODBC.h | 6 ++--- .../include/Poco/Data/ODBC/Unicode_WIN32.h | 6 ++--- Data/ODBC/include/Poco/Data/ODBC/Utility.h | 6 ++--- Data/ODBC/src/Binder.cpp | 6 ++--- Data/ODBC/src/ConnectionHandle.cpp | 6 ++--- Data/ODBC/src/Connector.cpp | 6 ++--- Data/ODBC/src/Diagnostics.cpp | 6 ++--- Data/ODBC/src/EnvironmentHandle.cpp | 6 ++--- Data/ODBC/src/Error.cpp | 6 ++--- Data/ODBC/src/Extractor.cpp | 6 ++--- Data/ODBC/src/ODBCException.cpp | 6 ++--- Data/ODBC/src/ODBCMetaColumn.cpp | 6 ++--- Data/ODBC/src/ODBCStatementImpl.cpp | 6 ++--- Data/ODBC/src/Parameter.cpp | 6 ++--- Data/ODBC/src/Preparator.cpp | 6 ++--- Data/ODBC/src/SessionImpl.cpp | 6 ++--- Data/ODBC/src/TypeInfo.cpp | 6 ++--- Data/ODBC/src/Unicode_UNIXODBC.cpp | 6 ++--- Data/ODBC/src/Unicode_WIN32.cpp | 6 ++--- Data/ODBC/src/Utility.cpp | 6 ++--- .../Poco/Data/PostgreSQL/BinaryExtractor.h | 6 ++--- .../include/Poco/Data/PostgreSQL/Binder.h | 6 ++--- .../include/Poco/Data/PostgreSQL/Connector.h | 6 ++--- .../include/Poco/Data/PostgreSQL/Extractor.h | 6 ++--- .../Data/PostgreSQL/PostgreSQLException.h | 6 ++--- .../Data/PostgreSQL/PostgreSQLStatementImpl.h | 6 ++--- .../Poco/Data/PostgreSQL/PostgreSQLTypes.h | 6 ++--- .../Poco/Data/PostgreSQL/SessionHandle.h | 6 ++--- .../Poco/Data/PostgreSQL/SessionImpl.h | 6 ++--- .../Poco/Data/PostgreSQL/StatementExecutor.h | 6 ++--- .../include/Poco/Data/PostgreSQL/Utility.h | 6 ++--- Data/PostgreSQL/src/BinaryExtractor.cpp | 6 ++--- Data/PostgreSQL/src/Binder.cpp | 6 ++--- Data/PostgreSQL/src/Connector.cpp | 6 ++--- Data/PostgreSQL/src/Extractor.cpp | 6 ++--- Data/PostgreSQL/src/PostgreSQLException.cpp | 6 ++--- .../src/PostgreSQLStatementImpl.cpp | 6 ++--- Data/PostgreSQL/src/PostgreSQLTypes.cpp | 6 ++--- Data/PostgreSQL/src/SessionHandle.cpp | 6 ++--- Data/PostgreSQL/src/SessionImpl.cpp | 6 ++--- Data/PostgreSQL/src/StatementExecutor.cpp | 6 ++--- Data/PostgreSQL/src/Utility.cpp | 6 ++--- Data/PostgreSQL/testsuite/src/SQLExecutor.cpp | 5 ++-- Data/SQLite/include/Poco/Data/SQLite/Binder.h | 6 ++--- .../include/Poco/Data/SQLite/Connector.h | 6 ++--- .../include/Poco/Data/SQLite/Extractor.h | 6 ++--- .../include/Poco/Data/SQLite/Notifier.h | 6 ++--- .../Poco/Data/SQLite/SQLiteException.h | 6 ++--- .../Poco/Data/SQLite/SQLiteStatementImpl.h | 6 ++--- .../include/Poco/Data/SQLite/SessionImpl.h | 6 ++--- .../SQLite/include/Poco/Data/SQLite/Utility.h | 6 ++--- Data/SQLite/src/Binder.cpp | 6 ++--- Data/SQLite/src/Connector.cpp | 6 ++--- Data/SQLite/src/Extractor.cpp | 6 ++--- Data/SQLite/src/Notifier.cpp | 6 ++--- Data/SQLite/src/SQLiteException.cpp | 6 ++--- Data/SQLite/src/SQLiteStatementImpl.cpp | 6 ++--- Data/SQLite/src/SessionImpl.cpp | 6 ++--- Data/SQLite/src/Utility.cpp | 6 ++--- Data/SQLite/testsuite/src/SQLiteTest.cpp | 5 ++-- Data/SQLite/testsuite/src/SQLiteTest.h | 5 ++-- Data/include/Poco/Data/AbstractBinder.h | 5 ++-- Data/include/Poco/Data/AbstractBinding.h | 5 ++-- Data/include/Poco/Data/AbstractExtraction.h | 5 ++-- Data/include/Poco/Data/AbstractPreparation.h | 5 ++-- Data/include/Poco/Data/AbstractSessionImpl.h | 5 ++-- Data/include/Poco/Data/ArchiveStrategy.h | 5 ++-- Data/include/Poco/Data/AutoTransaction.h | 5 ++-- Data/include/Poco/Data/Binding.h | 5 ++-- Data/include/Poco/Data/Bulk.h | 5 ++-- Data/include/Poco/Data/BulkBinding.h | 5 ++-- Data/include/Poco/Data/BulkExtraction.h | 5 ++-- Data/include/Poco/Data/Column.h | 5 ++-- Data/include/Poco/Data/Connector.h | 5 ++-- Data/include/Poco/Data/Constants.h | 5 ++-- Data/include/Poco/Data/DataException.h | 5 ++-- Data/include/Poco/Data/Date.h | 6 ++--- Data/include/Poco/Data/DynamicDateTime.h | 10 +++----- Data/include/Poco/Data/DynamicLOB.h | 10 +++----- Data/include/Poco/Data/Extraction.h | 5 ++-- Data/include/Poco/Data/JSONRowFormatter.h | 5 ++-- Data/include/Poco/Data/LOB.h | 10 +++----- Data/include/Poco/Data/LOBStream.h | 5 ++-- Data/include/Poco/Data/Limit.h | 5 ++-- Data/include/Poco/Data/MetaColumn.h | 5 ++-- Data/include/Poco/Data/PooledSessionHolder.h | 5 ++-- Data/include/Poco/Data/PooledSessionImpl.h | 5 ++-- Data/include/Poco/Data/Position.h | 5 ++-- Data/include/Poco/Data/Preparation.h | 5 ++-- Data/include/Poco/Data/Range.h | 5 ++-- Data/include/Poco/Data/RecordSet.h | 5 ++-- Data/include/Poco/Data/Row.h | 5 ++-- Data/include/Poco/Data/RowFilter.h | 5 ++-- Data/include/Poco/Data/RowFormatter.h | 5 ++-- Data/include/Poco/Data/RowIterator.h | 5 ++-- Data/include/Poco/Data/SQLChannel.h | 5 ++-- Data/include/Poco/Data/Session.h | 5 ++-- Data/include/Poco/Data/SessionFactory.h | 5 ++-- Data/include/Poco/Data/SessionImpl.h | 5 ++-- Data/include/Poco/Data/SessionPool.h | 5 ++-- Data/include/Poco/Data/SessionPoolContainer.h | 5 ++-- Data/include/Poco/Data/SimpleRowFormatter.h | 5 ++-- Data/include/Poco/Data/Statement.h | 5 ++-- Data/include/Poco/Data/StatementCreator.h | 5 ++-- Data/include/Poco/Data/StatementImpl.h | 5 ++-- Data/include/Poco/Data/Transaction.h | 5 ++-- Data/include/Poco/Data/Transcoder.h | 5 ++-- Data/include/Poco/Data/TypeHandler.h | 5 ++-- Data/samples/TypeHandler/src/TypeHandler.cpp | 5 ++-- Data/src/AbstractBinder.cpp | 5 ++-- Data/src/AbstractBinding.cpp | 5 ++-- Data/src/AbstractExtraction.cpp | 5 ++-- Data/src/AbstractExtractor.cpp | 5 ++-- Data/src/AbstractPreparation.cpp | 5 ++-- Data/src/AbstractPreparator.cpp | 5 ++-- Data/src/ArchiveStrategy.cpp | 5 ++-- Data/src/Bulk.cpp | 5 ++-- Data/src/Connector.cpp | 5 ++-- Data/src/DataException.cpp | 5 ++-- Data/src/Date.cpp | 10 +++----- Data/src/DynamicLOB.cpp | 5 ++-- Data/src/JSONRowFormatter.cpp | 5 ++-- Data/src/Limit.cpp | 5 ++-- Data/src/MetaColumn.cpp | 5 ++-- Data/src/PooledSessionHolder.cpp | 5 ++-- Data/src/PooledSessionImpl.cpp | 5 ++-- Data/src/Position.cpp | 5 ++-- Data/src/Range.cpp | 5 ++-- Data/src/RecordSet.cpp | 5 ++-- Data/src/Row.cpp | 5 ++-- Data/src/RowFilter.cpp | 5 ++-- Data/src/RowFormatter.cpp | 5 ++-- Data/src/RowIterator.cpp | 5 ++-- Data/src/SQLChannel.cpp | 5 ++-- Data/src/Session.cpp | 5 ++-- Data/src/SessionFactory.cpp | 5 ++-- Data/src/SessionImpl.cpp | 5 ++-- Data/src/SessionPool.cpp | 5 ++-- Data/src/SessionPoolContainer.cpp | 5 ++-- Data/src/SimpleRowFormatter.cpp | 5 ++-- Data/src/Statement.cpp | 5 ++-- Data/src/StatementCreator.cpp | 5 ++-- Data/src/StatementImpl.cpp | 5 ++-- Data/src/Time.cpp | 10 +++----- Data/src/Transaction.cpp | 5 ++-- Data/src/Transcoder.cpp | 5 ++-- Data/testsuite/src/Binder.cpp | 6 ++--- Data/testsuite/src/Binder.h | 6 ++--- Data/testsuite/src/Connector.cpp | 6 ++--- Data/testsuite/src/Connector.h | 6 ++--- Data/testsuite/src/Extractor.cpp | 6 ++--- Data/testsuite/src/Extractor.h | 6 ++--- Data/testsuite/src/Preparator.cpp | 6 ++--- Data/testsuite/src/Preparator.h | 6 ++--- Data/testsuite/src/SQLParserTest.cpp | 5 ++-- Data/testsuite/src/SessionImpl.cpp | 6 ++--- Data/testsuite/src/SessionImpl.h | 6 ++--- Data/testsuite/src/TestStatementImpl.cpp | 6 ++--- Data/testsuite/src/TestStatementImpl.h | 6 ++--- Foundation/include/Poco/Dynamic/Pair.h | 8 ++---- Foundation/include/Poco/Dynamic/Struct.h | 8 +++--- Foundation/include/Poco/Dynamic/Var.h | 8 +++--- Foundation/include/Poco/Dynamic/VarHolder.h | 5 ++-- Foundation/include/Poco/Dynamic/VarIterator.h | 5 ++-- Foundation/include/Poco/Dynamic/VarVisitor.h | 9 +++---- Foundation/include/Poco/FunctionDelegate.h | 10 ++++---- Foundation/src/Var.cpp | 5 ++-- Foundation/src/VarHolder.cpp | 5 ++-- Foundation/src/VarIterator.cpp | 5 ++-- Foundation/src/VarVisitor.cpp | 5 ++-- JSON/include/Poco/JSON/Array.h | 15 +++++------ JSON/include/Poco/JSON/Handler.h | 5 ++-- JSON/include/Poco/JSON/JSONException.h | 5 ++-- JSON/include/Poco/JSON/Object.h | 15 +++++------ JSON/include/Poco/JSON/ParseHandler.h | 5 ++-- JSON/include/Poco/JSON/Parser.h | 5 ++-- JSON/include/Poco/JSON/ParserImpl.h | 5 ++-- JSON/include/Poco/JSON/PrintHandler.h | 5 ++-- JSON/include/Poco/JSON/Query.h | 5 ++-- JSON/include/Poco/JSON/Stringifier.h | 5 ++-- JSON/include/Poco/JSON/Template.h | 5 ++-- JSON/include/Poco/JSON/TemplateCache.h | 5 ++-- JSON/src/Array.cpp | 5 ++-- JSON/src/Handler.cpp | 5 ++-- JSON/src/JSONException.cpp | 5 ++-- JSON/src/Object.cpp | 6 ++--- JSON/src/ParseHandler.cpp | 5 ++-- JSON/src/Parser.cpp | 5 ++-- JSON/src/ParserImpl.cpp | 5 ++-- JSON/src/PrintHandler.cpp | 5 ++-- JSON/src/Query.cpp | 5 ++-- JSON/src/Stringifier.cpp | 5 ++-- JSON/src/Template.cpp | 5 ++-- JSON/src/TemplateCache.cpp | 5 ++-- JWT/include/Poco/JWT/JWTException.h | 5 ++-- JWT/include/Poco/JWT/Serializer.h | 5 ++-- JWT/include/Poco/JWT/Signer.h | 5 ++-- JWT/include/Poco/JWT/Token.h | 5 ++-- JWT/src/JWTException.cpp | 5 ++-- JWT/src/Serializer.cpp | 5 ++-- JWT/src/Signer.cpp | 5 ++-- JWT/src/Token.cpp | 5 ++-- MongoDB/include/Poco/MongoDB/Array.h | 5 ++-- MongoDB/include/Poco/MongoDB/BSONReader.h | 5 ++-- MongoDB/include/Poco/MongoDB/BSONWriter.h | 5 ++-- MongoDB/include/Poco/MongoDB/Binary.h | 5 ++-- MongoDB/include/Poco/MongoDB/Connection.h | 5 ++-- MongoDB/include/Poco/MongoDB/Database.h | 5 ++-- MongoDB/include/Poco/MongoDB/Document.h | 5 ++-- MongoDB/include/Poco/MongoDB/Element.h | 5 ++-- MongoDB/include/Poco/MongoDB/JavaScriptCode.h | 5 ++-- MongoDB/include/Poco/MongoDB/Message.h | 5 ++-- MongoDB/include/Poco/MongoDB/ObjectId.h | 5 ++-- MongoDB/include/Poco/MongoDB/OpMsgCursor.h | 5 ++-- MongoDB/include/Poco/MongoDB/OpMsgMessage.h | 5 ++-- MongoDB/include/Poco/MongoDB/ReadPreference.h | 5 ++-- .../include/Poco/MongoDB/RegularExpression.h | 5 ++-- MongoDB/include/Poco/MongoDB/ReplicaSet.h | 5 ++-- .../Poco/MongoDB/ReplicaSetConnection.h | 5 ++-- MongoDB/include/Poco/MongoDB/ReplicaSetURI.h | 5 ++-- .../include/Poco/MongoDB/ServerDescription.h | 5 ++-- .../Poco/MongoDB/TopologyChangeNotification.h | 5 ++-- .../Poco/MongoDB/TopologyDescription.h | 5 ++-- MongoDB/src/Array.cpp | 5 ++-- MongoDB/src/Binary.cpp | 5 ++-- MongoDB/src/Connection.cpp | 5 ++-- MongoDB/src/Database.cpp | 5 ++-- MongoDB/src/Document.cpp | 5 ++-- MongoDB/src/Element.cpp | 5 ++-- MongoDB/src/JavaScriptCode.cpp | 5 ++-- MongoDB/src/Message.cpp | 5 ++-- MongoDB/src/MessageHeader.cpp | 5 ++-- MongoDB/src/ObjectId.cpp | 5 ++-- MongoDB/src/OpMsgCursor.cpp | 5 ++-- MongoDB/src/OpMsgMessage.cpp | 5 ++-- MongoDB/src/ReadPreference.cpp | 5 ++-- MongoDB/src/RegularExpression.cpp | 5 ++-- MongoDB/src/ReplicaSet.cpp | 5 ++-- MongoDB/src/ReplicaSetConnection.cpp | 5 ++-- MongoDB/src/ReplicaSetURI.cpp | 5 ++-- MongoDB/src/ServerDescription.cpp | 5 ++-- MongoDB/src/TopologyDescription.cpp | 5 ++-- .../Poco/Net/AbstractHTTPRequestHandler.h | 5 ++-- Net/include/Poco/Net/DNS.h | 5 ++-- Net/include/Poco/Net/DatagramSocket.h | 5 ++-- Net/include/Poco/Net/DatagramSocketImpl.h | 5 ++-- Net/include/Poco/Net/DialogSocket.h | 5 ++-- Net/include/Poco/Net/EscapeHTMLStream.h | 5 ++-- Net/include/Poco/Net/FTPClientSession.h | 5 ++-- Net/include/Poco/Net/FTPStreamFactory.h | 5 ++-- Net/include/Poco/Net/FilePartSource.h | 5 ++-- Net/include/Poco/Net/HTMLForm.h | 5 ++-- .../Poco/Net/HTTPAuthenticationParams.h | 5 ++-- Net/include/Poco/Net/HTTPBasicCredentials.h | 5 ++-- Net/include/Poco/Net/HTTPBasicStreamBuf.h | 5 ++-- Net/include/Poco/Net/HTTPBufferAllocator.h | 5 ++-- Net/include/Poco/Net/HTTPChunkedStream.h | 5 ++-- Net/include/Poco/Net/HTTPClientSession.h | 5 ++-- Net/include/Poco/Net/HTTPCookie.h | 5 ++-- Net/include/Poco/Net/HTTPDigestCredentials.h | 5 ++-- Net/include/Poco/Net/HTTPFixedLengthStream.h | 5 ++-- Net/include/Poco/Net/HTTPHeaderStream.h | 5 ++-- Net/include/Poco/Net/HTTPIOStream.h | 5 ++-- Net/include/Poco/Net/HTTPMessage.h | 5 ++-- Net/include/Poco/Net/HTTPNTLMCredentials.h | 5 ++-- Net/include/Poco/Net/HTTPObserver.h | 5 ++-- Net/include/Poco/Net/HTTPReactorServer.h | 5 ++-- .../Poco/Net/HTTPReactorServerSession.h | 5 ++-- Net/include/Poco/Net/HTTPRequest.h | 5 ++-- Net/include/Poco/Net/HTTPRequestHandler.h | 5 ++-- .../Poco/Net/HTTPRequestHandlerFactory.h | 5 ++-- Net/include/Poco/Net/HTTPResponse.h | 5 ++-- Net/include/Poco/Net/HTTPServer.h | 5 ++-- Net/include/Poco/Net/HTTPServerConnection.h | 5 ++-- .../Poco/Net/HTTPServerConnectionFactory.h | 5 ++-- Net/include/Poco/Net/HTTPServerParams.h | 5 ++-- Net/include/Poco/Net/HTTPServerRequest.h | 5 ++-- Net/include/Poco/Net/HTTPServerRequestImpl.h | 5 ++-- Net/include/Poco/Net/HTTPServerResponse.h | 5 ++-- Net/include/Poco/Net/HTTPServerResponseImpl.h | 5 ++-- Net/include/Poco/Net/HTTPServerSession.h | 5 ++-- Net/include/Poco/Net/HTTPSession.h | 5 ++-- Net/include/Poco/Net/HTTPSessionFactory.h | 5 ++-- .../Poco/Net/HTTPSessionInstantiator.h | 5 ++-- Net/include/Poco/Net/HTTPStream.h | 5 ++-- Net/include/Poco/Net/HTTPStreamFactory.h | 5 ++-- Net/include/Poco/Net/HostEntry.h | 5 ++-- Net/include/Poco/Net/ICMPClient.h | 5 ++-- Net/include/Poco/Net/ICMPEventArgs.h | 5 ++-- Net/include/Poco/Net/ICMPPacket.h | 5 ++-- Net/include/Poco/Net/ICMPPacketImpl.h | 5 ++-- Net/include/Poco/Net/ICMPSocket.h | 5 ++-- Net/include/Poco/Net/ICMPSocketImpl.h | 5 ++-- Net/include/Poco/Net/ICMPv4PacketImpl.h | 5 ++-- Net/include/Poco/Net/IPAddressImpl.h | 6 ++--- Net/include/Poco/Net/MailMessage.h | 5 ++-- Net/include/Poco/Net/MailRecipient.h | 5 ++-- Net/include/Poco/Net/MailStream.h | 5 ++-- Net/include/Poco/Net/MediaType.h | 5 ++-- Net/include/Poco/Net/MessageHeader.h | 5 ++-- Net/include/Poco/Net/MultiSocketPoller.h | 5 ++-- Net/include/Poco/Net/MulticastSocket.h | 5 ++-- Net/include/Poco/Net/MultipartReader.h | 5 ++-- Net/include/Poco/Net/MultipartWriter.h | 5 ++-- Net/include/Poco/Net/NTLMCredentials.h | 5 ++-- Net/include/Poco/Net/NTPClient.h | 5 ++-- Net/include/Poco/Net/NTPEventArgs.h | 5 ++-- Net/include/Poco/Net/NTPPacket.h | 5 ++-- Net/include/Poco/Net/NameValueCollection.h | 5 ++-- Net/include/Poco/Net/Net.h | 5 ++-- Net/include/Poco/Net/NetException.h | 5 ++-- Net/include/Poco/Net/NetworkInterface.h | 5 ++-- Net/include/Poco/Net/NullPartHandler.h | 5 ++-- Net/include/Poco/Net/OAuth10Credentials.h | 5 ++-- Net/include/Poco/Net/OAuth20Credentials.h | 5 ++-- Net/include/Poco/Net/POP3ClientSession.h | 5 ++-- Net/include/Poco/Net/ParallelSocketAcceptor.h | 5 ++-- Net/include/Poco/Net/ParallelSocketReactor.h | 5 ++-- Net/include/Poco/Net/PartHandler.h | 5 ++-- Net/include/Poco/Net/PartSource.h | 5 ++-- Net/include/Poco/Net/PartStore.h | 5 ++-- Net/include/Poco/Net/PollSet.h | 5 ++-- Net/include/Poco/Net/QuotedPrintableDecoder.h | 5 ++-- Net/include/Poco/Net/QuotedPrintableEncoder.h | 5 ++-- Net/include/Poco/Net/RawSocket.h | 5 ++-- Net/include/Poco/Net/RawSocketImpl.h | 5 ++-- Net/include/Poco/Net/RemoteSyslogChannel.h | 5 ++-- Net/include/Poco/Net/RemoteSyslogListener.h | 5 ++-- Net/include/Poco/Net/SMTPChannel.h | 5 ++-- Net/include/Poco/Net/SMTPClientSession.h | 5 ++-- Net/include/Poco/Net/SSPINTLMCredentials.h | 5 ++-- Net/include/Poco/Net/ServerSocket.h | 5 ++-- Net/include/Poco/Net/ServerSocketImpl.h | 5 ++-- Net/include/Poco/Net/SingleSocketPoller.h | 5 ++-- Net/include/Poco/Net/Socket.h | 5 ++-- Net/include/Poco/Net/SocketAcceptor.h | 5 ++-- Net/include/Poco/Net/SocketAddressImpl.h | 6 ++--- Net/include/Poco/Net/SocketConnector.h | 5 ++-- Net/include/Poco/Net/SocketDefs.h | 5 ++-- Net/include/Poco/Net/SocketNotification.h | 5 ++-- Net/include/Poco/Net/SocketNotifier.h | 5 ++-- Net/include/Poco/Net/SocketReactor.h | 7 ++---- Net/include/Poco/Net/SocketStream.h | 5 ++-- Net/include/Poco/Net/StreamSocketImpl.h | 5 ++-- Net/include/Poco/Net/StringPartSource.h | 5 ++-- Net/include/Poco/Net/TCPReactorAcceptor.h | 5 ++-- Net/include/Poco/Net/TCPReactorServer.h | 4 +-- .../Poco/Net/TCPReactorServerConnection.h | 5 ++-- Net/include/Poco/Net/TCPServer.h | 5 ++-- Net/include/Poco/Net/TCPServerConnection.h | 5 ++-- .../Poco/Net/TCPServerConnectionFactory.h | 5 ++-- Net/include/Poco/Net/TCPServerDispatcher.h | 5 ++-- Net/include/Poco/Net/TCPServerParams.h | 5 ++-- Net/include/Poco/Net/UDPClient.h | 5 ++-- Net/include/Poco/Net/UDPHandler.h | 5 ++-- Net/include/Poco/Net/UDPServer.h | 5 ++-- Net/include/Poco/Net/UDPServerParams.h | 5 ++-- Net/include/Poco/Net/UDPSocketReader.h | 5 ++-- Net/include/Poco/Net/WebSocket.h | 5 ++-- Net/include/Poco/Net/WebSocketImpl.h | 5 ++-- Net/src/AbstractHTTPRequestHandler.cpp | 5 ++-- Net/src/DNS.cpp | 5 ++-- Net/src/DatagramSocket.cpp | 5 ++-- Net/src/DatagramSocketImpl.cpp | 5 ++-- Net/src/DialogSocket.cpp | 5 ++-- Net/src/EscapeHTMLStream.cpp | 5 ++-- Net/src/FTPClientSession.cpp | 5 ++-- Net/src/FTPStreamFactory.cpp | 5 ++-- Net/src/FilePartSource.cpp | 5 ++-- Net/src/HTMLForm.cpp | 5 ++-- Net/src/HTTPAuthenticationParams.cpp | 5 ++-- Net/src/HTTPBasicCredentials.cpp | 5 ++-- Net/src/HTTPBufferAllocator.cpp | 5 ++-- Net/src/HTTPChunkedStream.cpp | 5 ++-- Net/src/HTTPClientSession.cpp | 5 ++-- Net/src/HTTPCookie.cpp | 5 ++-- Net/src/HTTPCredentials.cpp | 5 ++-- Net/src/HTTPDigestCredentials.cpp | 5 ++-- Net/src/HTTPFixedLengthStream.cpp | 5 ++-- Net/src/HTTPHeaderStream.cpp | 5 ++-- Net/src/HTTPIOStream.cpp | 5 ++-- Net/src/HTTPMessage.cpp | 5 ++-- Net/src/HTTPNTLMCredentials.cpp | 5 ++-- Net/src/HTTPReactorServer.cpp | 4 +-- Net/src/HTTPReactorServerSession.cpp | 5 ++-- Net/src/HTTPRequest.cpp | 5 ++-- Net/src/HTTPRequestHandler.cpp | 5 ++-- Net/src/HTTPRequestHandlerFactory.cpp | 5 ++-- Net/src/HTTPResponse.cpp | 5 ++-- Net/src/HTTPServer.cpp | 5 ++-- Net/src/HTTPServerConnection.cpp | 5 ++-- Net/src/HTTPServerConnectionFactory.cpp | 5 ++-- Net/src/HTTPServerParams.cpp | 5 ++-- Net/src/HTTPServerRequest.cpp | 5 ++-- Net/src/HTTPServerRequestImpl.cpp | 5 ++-- Net/src/HTTPServerResponse.cpp | 5 ++-- Net/src/HTTPServerResponseImpl.cpp | 5 ++-- Net/src/HTTPServerSession.cpp | 5 ++-- Net/src/HTTPSession.cpp | 5 ++-- Net/src/HTTPSessionFactory.cpp | 5 ++-- Net/src/HTTPSessionInstantiator.cpp | 5 ++-- Net/src/HTTPStream.cpp | 5 ++-- Net/src/HTTPStreamFactory.cpp | 5 ++-- Net/src/HostEntry.cpp | 5 ++-- Net/src/ICMPClient.cpp | 5 ++-- Net/src/ICMPEventArgs.cpp | 5 ++-- Net/src/ICMPPacket.cpp | 5 ++-- Net/src/ICMPPacketImpl.cpp | 5 ++-- Net/src/ICMPSocket.cpp | 5 ++-- Net/src/ICMPSocketImpl.cpp | 5 ++-- Net/src/ICMPv4PacketImpl.cpp | 5 ++-- Net/src/IPAddress.cpp | 5 ++-- Net/src/IPAddressImpl.cpp | 6 ++--- Net/src/MailMessage.cpp | 5 ++-- Net/src/MailRecipient.cpp | 5 ++-- Net/src/MailStream.cpp | 5 ++-- Net/src/MediaType.cpp | 5 ++-- Net/src/MessageHeader.cpp | 5 ++-- Net/src/MulticastSocket.cpp | 5 ++-- Net/src/MultipartReader.cpp | 5 ++-- Net/src/MultipartWriter.cpp | 5 ++-- Net/src/NTLMCredentials.cpp | 5 ++-- Net/src/NTPClient.cpp | 5 ++-- Net/src/NTPEventArgs.cpp | 5 ++-- Net/src/NTPPacket.cpp | 5 ++-- Net/src/NameValueCollection.cpp | 5 ++-- Net/src/Net.cpp | 5 ++-- Net/src/NetException.cpp | 5 ++-- Net/src/NetworkInterface.cpp | 25 ++++++++----------- Net/src/NullPartHandler.cpp | 5 ++-- Net/src/OAuth10Credentials.cpp | 5 ++-- Net/src/OAuth20Credentials.cpp | 5 ++-- Net/src/POP3ClientSession.cpp | 5 ++-- Net/src/PartHandler.cpp | 5 ++-- Net/src/PartSource.cpp | 5 ++-- Net/src/PartStore.cpp | 5 ++-- Net/src/PollSet.cpp | 5 ++-- Net/src/QuotedPrintableDecoder.cpp | 5 ++-- Net/src/QuotedPrintableEncoder.cpp | 5 ++-- Net/src/RawSocket.cpp | 5 ++-- Net/src/RawSocketImpl.cpp | 5 ++-- Net/src/RemoteSyslogChannel.cpp | 5 ++-- Net/src/RemoteSyslogListener.cpp | 5 ++-- Net/src/SMTPChannel.cpp | 5 ++-- Net/src/SMTPClientSession.cpp | 5 ++-- Net/src/SSPINTLMCredentials.cpp | 10 +++----- Net/src/ServerSocket.cpp | 5 ++-- Net/src/ServerSocketImpl.cpp | 5 ++-- Net/src/Socket.cpp | 5 ++-- Net/src/SocketAddress.cpp | 5 ++-- Net/src/SocketAddressImpl.cpp | 6 ++--- Net/src/SocketImpl.cpp | 5 ++-- Net/src/SocketNotification.cpp | 5 ++-- Net/src/SocketNotifier.cpp | 5 ++-- Net/src/SocketProactor.cpp | 5 ++-- Net/src/SocketReactor.cpp | 5 ++-- Net/src/SocketStream.cpp | 5 ++-- Net/src/StreamSocket.cpp | 5 ++-- Net/src/StreamSocketImpl.cpp | 5 ++-- Net/src/StringPartSource.cpp | 5 ++-- Net/src/TCPReactorAcceptor.cpp | 5 ++-- Net/src/TCPReactorServer.cpp | 5 ++-- Net/src/TCPReactorServerConnection.cpp | 5 ++-- Net/src/TCPServer.cpp | 5 ++-- Net/src/TCPServerConnection.cpp | 5 ++-- Net/src/TCPServerConnectionFactory.cpp | 5 ++-- Net/src/TCPServerDispatcher.cpp | 5 ++-- Net/src/TCPServerParams.cpp | 5 ++-- Net/src/UDPClient.cpp | 5 ++-- Net/src/UDPServerParams.cpp | 5 ++-- Net/src/WebSocket.cpp | 5 ++-- Net/src/WebSocketImpl.cpp | 5 ++-- Net/testsuite/src/FTPClientSessionTest.h | 5 ++-- Net/testsuite/src/SocketReactorTest.h | 5 ++-- .../Poco/Net/AcceptCertificateHandler.h | 5 ++-- .../Poco/Net/CertificateHandlerFactory.h | 5 ++-- .../Poco/Net/CertificateHandlerFactoryMgr.h | 5 ++-- .../Poco/Net/ConsoleCertificateHandler.h | 5 ++-- NetSSL_OpenSSL/include/Poco/Net/Context.h | 5 ++-- .../include/Poco/Net/FTPSClientSession.h | 5 ++-- .../include/Poco/Net/FTPSStreamFactory.h | 5 ++-- .../include/Poco/Net/HTTPSClientSession.h | 5 ++-- .../Poco/Net/HTTPSSessionInstantiator.h | 5 ++-- .../include/Poco/Net/HTTPSStreamFactory.h | 5 ++-- .../Poco/Net/InvalidCertificateHandler.h | 5 ++-- .../include/Poco/Net/KeyConsoleHandler.h | 5 ++-- .../include/Poco/Net/KeyFileHandler.h | 5 ++-- NetSSL_OpenSSL/include/Poco/Net/NetSSL.h | 5 ++-- .../include/Poco/Net/PrivateKeyFactory.h | 5 ++-- .../include/Poco/Net/PrivateKeyFactoryMgr.h | 5 ++-- .../Poco/Net/PrivateKeyPassphraseHandler.h | 5 ++-- .../Poco/Net/RejectCertificateHandler.h | 5 ++-- .../include/Poco/Net/SSLException.h | 5 ++-- NetSSL_OpenSSL/include/Poco/Net/SSLManager.h | 5 ++-- .../Poco/Net/SecureSMTPClientSession.h | 5 ++-- .../include/Poco/Net/SecureServerSocket.h | 5 ++-- .../include/Poco/Net/SecureServerSocketImpl.h | 5 ++-- .../include/Poco/Net/SecureSocketImpl.h | 5 ++-- .../include/Poco/Net/SecureStreamSocket.h | 5 ++-- .../include/Poco/Net/SecureStreamSocketImpl.h | 5 ++-- NetSSL_OpenSSL/include/Poco/Net/Session.h | 5 ++-- NetSSL_OpenSSL/include/Poco/Net/Utility.h | 5 ++-- .../include/Poco/Net/VerificationErrorArgs.h | 5 ++-- .../include/Poco/Net/X509Certificate.h | 5 ++-- .../src/AcceptCertificateHandler.cpp | 5 ++-- .../src/CertificateHandlerFactory.cpp | 5 ++-- .../src/CertificateHandlerFactoryMgr.cpp | 5 ++-- .../src/ConsoleCertificateHandler.cpp | 5 ++-- NetSSL_OpenSSL/src/Context.cpp | 5 ++-- NetSSL_OpenSSL/src/FTPSClientSession.cpp | 5 ++-- NetSSL_OpenSSL/src/FTPSStreamFactory.cpp | 5 ++-- NetSSL_OpenSSL/src/HTTPSClientSession.cpp | 5 ++-- .../src/HTTPSSessionInstantiator.cpp | 5 ++-- NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp | 5 ++-- .../src/InvalidCertificateHandler.cpp | 5 ++-- NetSSL_OpenSSL/src/KeyConsoleHandler.cpp | 5 ++-- NetSSL_OpenSSL/src/KeyFileHandler.cpp | 5 ++-- NetSSL_OpenSSL/src/PrivateKeyFactory.cpp | 5 ++-- NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp | 5 ++-- .../src/PrivateKeyPassphraseHandler.cpp | 5 ++-- .../src/RejectCertificateHandler.cpp | 5 ++-- NetSSL_OpenSSL/src/SSLException.cpp | 5 ++-- NetSSL_OpenSSL/src/SSLManager.cpp | 5 ++-- .../src/SecureSMTPClientSession.cpp | 5 ++-- NetSSL_OpenSSL/src/SecureServerSocket.cpp | 5 ++-- NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp | 5 ++-- NetSSL_OpenSSL/src/SecureSocketImpl.cpp | 5 ++-- NetSSL_OpenSSL/src/SecureStreamSocket.cpp | 5 ++-- NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp | 5 ++-- NetSSL_OpenSSL/src/Session.cpp | 5 ++-- NetSSL_OpenSSL/src/Utility.cpp | 5 ++-- NetSSL_OpenSSL/src/VerificationErrorArgs.cpp | 5 ++-- NetSSL_OpenSSL/src/X509Certificate.cpp | 5 ++-- .../testsuite/src/FTPSClientSessionTest.h | 5 ++-- .../Poco/Net/AcceptCertificateHandler.h | 5 ++-- .../include/Poco/Net/AutoSecBufferDesc.h | 5 ++-- .../Poco/Net/CertificateHandlerFactory.h | 5 ++-- .../Poco/Net/CertificateHandlerFactoryMgr.h | 5 ++-- .../Poco/Net/ConsoleCertificateHandler.h | 5 ++-- NetSSL_Win/include/Poco/Net/Context.h | 5 ++-- .../include/Poco/Net/HTTPSClientSession.h | 5 ++-- .../Poco/Net/HTTPSSessionInstantiator.h | 5 ++-- .../include/Poco/Net/HTTPSStreamFactory.h | 5 ++-- .../Poco/Net/InvalidCertificateHandler.h | 5 ++-- .../include/Poco/Net/KeyConsoleHandler.h | 5 ++-- NetSSL_Win/include/Poco/Net/KeyFileHandler.h | 5 ++-- NetSSL_Win/include/Poco/Net/NetSSL.h | 5 ++-- .../include/Poco/Net/PrivateKeyFactory.h | 5 ++-- .../include/Poco/Net/PrivateKeyFactoryMgr.h | 5 ++-- .../Poco/Net/PrivateKeyPassphraseHandler.h | 5 ++-- .../Poco/Net/RejectCertificateHandler.h | 5 ++-- NetSSL_Win/include/Poco/Net/SSLException.h | 5 ++-- NetSSL_Win/include/Poco/Net/SSLManager.h | 5 ++-- .../Poco/Net/SecureSMTPClientSession.h | 5 ++-- .../include/Poco/Net/SecureServerSocket.h | 5 ++-- .../include/Poco/Net/SecureServerSocketImpl.h | 5 ++-- .../include/Poco/Net/SecureSocketImpl.h | 5 ++-- .../include/Poco/Net/SecureStreamSocket.h | 5 ++-- .../include/Poco/Net/SecureStreamSocketImpl.h | 5 ++-- NetSSL_Win/include/Poco/Net/Session.h | 5 ++-- NetSSL_Win/include/Poco/Net/Utility.h | 5 ++-- .../include/Poco/Net/VerificationErrorArgs.h | 5 ++-- NetSSL_Win/include/Poco/Net/X509Certificate.h | 5 ++-- NetSSL_Win/src/AcceptCertificateHandler.cpp | 5 ++-- NetSSL_Win/src/CertificateHandlerFactory.cpp | 5 ++-- .../src/CertificateHandlerFactoryMgr.cpp | 5 ++-- NetSSL_Win/src/ConsoleCertificateHandler.cpp | 5 ++-- NetSSL_Win/src/Context.cpp | 5 ++-- NetSSL_Win/src/HTTPSClientSession.cpp | 5 ++-- NetSSL_Win/src/HTTPSSessionInstantiator.cpp | 5 ++-- NetSSL_Win/src/HTTPSStreamFactory.cpp | 5 ++-- NetSSL_Win/src/InvalidCertificateHandler.cpp | 5 ++-- NetSSL_Win/src/KeyConsoleHandler.cpp | 5 ++-- NetSSL_Win/src/KeyFileHandler.cpp | 5 ++-- NetSSL_Win/src/PrivateKeyFactory.cpp | 5 ++-- NetSSL_Win/src/PrivateKeyFactoryMgr.cpp | 5 ++-- .../src/PrivateKeyPassphraseHandler.cpp | 5 ++-- NetSSL_Win/src/RejectCertificateHandler.cpp | 5 ++-- NetSSL_Win/src/SSLException.cpp | 5 ++-- NetSSL_Win/src/SSLManager.cpp | 5 ++-- NetSSL_Win/src/SecureSMTPClientSession.cpp | 5 ++-- NetSSL_Win/src/SecureServerSocket.cpp | 5 ++-- NetSSL_Win/src/SecureServerSocketImpl.cpp | 5 ++-- NetSSL_Win/src/SecureSocketImpl.cpp | 5 ++-- NetSSL_Win/src/SecureStreamSocket.cpp | 5 ++-- NetSSL_Win/src/SecureStreamSocketImpl.cpp | 5 ++-- NetSSL_Win/src/Session.cpp | 5 ++-- NetSSL_Win/src/Utility.cpp | 5 ++-- NetSSL_Win/src/VerificationErrorArgs.cpp | 5 ++-- NetSSL_Win/src/X509Certificate.cpp | 5 ++-- PDF/include/Poco/PDF/AttributedString.h | 5 ++-- PDF/include/Poco/PDF/Cell.h | 5 ++-- PDF/include/Poco/PDF/Destination.h | 5 ++-- PDF/include/Poco/PDF/Encoder.h | 5 ++-- PDF/include/Poco/PDF/Font.h | 5 ++-- PDF/include/Poco/PDF/Image.h | 5 ++-- PDF/include/Poco/PDF/LinkAnnotation.h | 5 ++-- PDF/include/Poco/PDF/Outline.h | 5 ++-- PDF/include/Poco/PDF/PDFException.h | 5 ++-- PDF/include/Poco/PDF/Page.h | 5 ++-- PDF/include/Poco/PDF/Resource.h | 5 ++-- PDF/include/Poco/PDF/Table.h | 5 ++-- PDF/include/Poco/PDF/TextAnnotation.h | 5 ++-- PDF/include/Poco/PDF/XMLTemplate.h | 5 ++-- PDF/src/AttributedString.cpp | 5 ++-- PDF/src/Cell.cpp | 5 ++-- PDF/src/Destination.cpp | 5 ++-- PDF/src/Document.cpp | 5 ++-- PDF/src/Encoder.cpp | 5 ++-- PDF/src/Font.cpp | 5 ++-- PDF/src/Image.cpp | 5 ++-- PDF/src/LinkAnnotation.cpp | 5 ++-- PDF/src/Outline.cpp | 5 ++-- PDF/src/PDFException.cpp | 5 ++-- PDF/src/Page.cpp | 5 ++-- PDF/src/Table.cpp | 5 ++-- PDF/src/TextAnnotation.cpp | 5 ++-- PDF/src/XMLTemplate.cpp | 5 ++-- PocoDoc/src/DocWriter.h | 5 ++-- .../include/Poco/Prometheus/AtomicFloat.h | 5 ++-- .../include/Poco/Prometheus/CallbackMetric.h | 5 ++-- .../include/Poco/Prometheus/Collector.h | 5 ++-- Prometheus/include/Poco/Prometheus/Counter.h | 5 ++-- Prometheus/include/Poco/Prometheus/Exporter.h | 5 ++-- Prometheus/include/Poco/Prometheus/Gauge.h | 5 ++-- .../include/Poco/Prometheus/Histogram.h | 5 ++-- .../include/Poco/Prometheus/IntCounter.h | 5 ++-- Prometheus/include/Poco/Prometheus/IntGauge.h | 5 ++-- .../include/Poco/Prometheus/LabeledMetric.h | 5 ++-- .../Poco/Prometheus/LabeledMetricImpl.h | 5 ++-- Prometheus/include/Poco/Prometheus/Metric.h | 5 ++-- .../Poco/Prometheus/MetricsRequestHandler.h | 5 ++-- .../include/Poco/Prometheus/MetricsServer.h | 5 ++-- .../Poco/Prometheus/ProcessCollector.h | 5 ++-- Prometheus/include/Poco/Prometheus/Registry.h | 5 ++-- .../include/Poco/Prometheus/TextExporter.h | 5 ++-- .../Poco/Prometheus/ThreadPoolCollector.h | 5 ++-- Prometheus/src/Collector.cpp | 5 ++-- Prometheus/src/Counter.cpp | 5 ++-- Prometheus/src/Gauge.cpp | 5 ++-- Prometheus/src/Histogram.cpp | 5 ++-- Prometheus/src/IntCounter.cpp | 5 ++-- Prometheus/src/IntGauge.cpp | 5 ++-- Prometheus/src/LabeledMetric.cpp | 5 ++-- Prometheus/src/MetricsRequestHandler.cpp | 5 ++-- Prometheus/src/MetricsServer.cpp | 5 ++-- Prometheus/src/ProcessCollector.cpp | 5 ++-- Prometheus/src/Registry.cpp | 5 ++-- Prometheus/src/TextExporter.cpp | 5 ++-- Prometheus/src/ThreadPoolCollector.cpp | 5 ++-- Redis/include/Poco/Redis/Array.h | 6 ++--- Redis/include/Poco/Redis/AsyncReader.h | 5 ++-- Redis/include/Poco/Redis/Client.h | 5 ++-- Redis/include/Poco/Redis/Command.h | 6 ++--- Redis/include/Poco/Redis/Error.h | 5 ++-- Redis/include/Poco/Redis/Exception.h | 5 ++-- Redis/include/Poco/Redis/RedisEventArgs.h | 5 ++-- Redis/include/Poco/Redis/RedisNotifications.h | 5 ++-- Redis/include/Poco/Redis/RedisStream.h | 5 ++-- Redis/include/Poco/Redis/Type.h | 5 ++-- Redis/src/Array.cpp | 5 ++-- Redis/src/AsyncReader.cpp | 5 ++-- Redis/src/Client.cpp | 5 ++-- Redis/src/Command.cpp | 5 ++-- Redis/src/Error.cpp | 5 ++-- Redis/src/Exception.cpp | 5 ++-- Redis/src/RedisEventArgs.cpp | 5 ++-- Redis/src/RedisNotifications.cpp | 5 ++-- Redis/src/RedisStream.cpp | 5 ++-- Redis/src/Type.cpp | 5 ++-- SevenZip/include/Poco/SevenZip/Archive.h | 5 ++-- SevenZip/include/Poco/SevenZip/ArchiveEntry.h | 5 ++-- SevenZip/src/Archive.cpp | 5 ++-- SevenZip/src/ArchiveEntry.cpp | 5 ++-- .../include/Poco/Util/AbstractConfiguration.h | 5 ++-- Util/include/Poco/Util/Application.h | 5 ++-- Util/include/Poco/Util/ConfigurationMapper.h | 5 ++-- Util/include/Poco/Util/ConfigurationView.h | 5 ++-- .../Poco/Util/FastLoggerConfigurator.h | 5 ++-- .../Poco/Util/FilesystemConfiguration.h | 5 ++-- Util/include/Poco/Util/HelpFormatter.h | 5 ++-- Util/include/Poco/Util/IniFileConfiguration.h | 5 ++-- Util/include/Poco/Util/IntValidator.h | 5 ++-- Util/include/Poco/Util/JSONConfiguration.h | 5 ++-- Util/include/Poco/Util/LayeredConfiguration.h | 5 ++-- .../Poco/Util/LocalConfigurationView.h | 5 ++-- Util/include/Poco/Util/LoggingConfigurator.h | 5 ++-- Util/include/Poco/Util/LoggingSubsystem.h | 5 ++-- Util/include/Poco/Util/MapConfiguration.h | 5 ++-- Util/include/Poco/Util/Option.h | 5 ++-- Util/include/Poco/Util/OptionCallback.h | 5 ++-- Util/include/Poco/Util/OptionException.h | 5 ++-- Util/include/Poco/Util/OptionProcessor.h | 5 ++-- Util/include/Poco/Util/OptionSet.h | 5 ++-- .../Poco/Util/PropertyFileConfiguration.h | 5 ++-- Util/include/Poco/Util/RegExpValidator.h | 5 ++-- Util/include/Poco/Util/ServerApplication.h | 5 ++-- Util/include/Poco/Util/Subsystem.h | 5 ++-- Util/include/Poco/Util/SystemConfiguration.h | 5 ++-- Util/include/Poco/Util/Timer.h | 5 ++-- Util/include/Poco/Util/TimerTask.h | 5 ++-- Util/include/Poco/Util/TimerTaskAdapter.h | 5 ++-- Util/include/Poco/Util/Units.h | 12 +++------ Util/include/Poco/Util/Validator.h | 5 ++-- .../Poco/Util/WinRegistryConfiguration.h | 5 ++-- Util/include/Poco/Util/WinRegistryKey.h | 5 ++-- Util/include/Poco/Util/WinService.h | 5 ++-- Util/include/Poco/Util/XMLConfiguration.h | 5 ++-- Util/samples/Units/src/Units.cpp | 12 ++++----- Util/src/AbstractConfiguration.cpp | 5 ++-- Util/src/Application.cpp | 5 ++-- Util/src/ConfigurationMapper.cpp | 5 ++-- Util/src/ConfigurationView.cpp | 5 ++-- Util/src/FastLoggerConfigurator.cpp | 5 ++-- Util/src/FilesystemConfiguration.cpp | 5 ++-- Util/src/HelpFormatter.cpp | 5 ++-- Util/src/IniFileConfiguration.cpp | 5 ++-- Util/src/IntValidator.cpp | 5 ++-- Util/src/JSONConfiguration.cpp | 5 ++-- Util/src/LayeredConfiguration.cpp | 5 ++-- Util/src/LocalConfigurationView.cpp | 5 ++-- Util/src/LoggingConfigurator.cpp | 5 ++-- Util/src/LoggingSubsystem.cpp | 5 ++-- Util/src/MapConfiguration.cpp | 5 ++-- Util/src/Option.cpp | 5 ++-- Util/src/OptionCallback.cpp | 5 ++-- Util/src/OptionException.cpp | 5 ++-- Util/src/OptionProcessor.cpp | 5 ++-- Util/src/OptionSet.cpp | 5 ++-- Util/src/PropertyFileConfiguration.cpp | 5 ++-- Util/src/RegExpValidator.cpp | 5 ++-- Util/src/ServerApplication.cpp | 5 ++-- Util/src/Subsystem.cpp | 5 ++-- Util/src/SystemConfiguration.cpp | 5 ++-- Util/src/Timer.cpp | 5 ++-- Util/src/TimerTask.cpp | 5 ++-- Util/src/Validator.cpp | 5 ++-- Util/src/WinRegistryConfiguration.cpp | 5 ++-- Util/src/WinRegistryKey.cpp | 5 ++-- Util/src/WinService.cpp | 5 ++-- Util/src/XMLConfiguration.cpp | 5 ++-- XML/include/Poco/DOM/AbstractContainerNode.h | 5 ++-- XML/include/Poco/DOM/AbstractNode.h | 5 ++-- XML/include/Poco/DOM/Attr.h | 5 ++-- XML/include/Poco/DOM/AttrMap.h | 5 ++-- XML/include/Poco/DOM/AutoPtr.h | 5 ++-- XML/include/Poco/DOM/CDATASection.h | 5 ++-- XML/include/Poco/DOM/CharacterData.h | 5 ++-- XML/include/Poco/DOM/ChildNodesList.h | 5 ++-- XML/include/Poco/DOM/Comment.h | 5 ++-- XML/include/Poco/DOM/DOMBuilder.h | 5 ++-- XML/include/Poco/DOM/DOMException.h | 5 ++-- XML/include/Poco/DOM/DOMImplementation.h | 5 ++-- XML/include/Poco/DOM/DOMObject.h | 5 ++-- XML/include/Poco/DOM/DOMParser.h | 5 ++-- XML/include/Poco/DOM/DOMSerializer.h | 5 ++-- XML/include/Poco/DOM/DOMWriter.h | 5 ++-- XML/include/Poco/DOM/DTDMap.h | 5 ++-- XML/include/Poco/DOM/Document.h | 5 ++-- XML/include/Poco/DOM/DocumentEvent.h | 5 ++-- XML/include/Poco/DOM/DocumentFragment.h | 5 ++-- XML/include/Poco/DOM/DocumentType.h | 5 ++-- XML/include/Poco/DOM/Element.h | 5 ++-- XML/include/Poco/DOM/ElementsByTagNameList.h | 5 ++-- XML/include/Poco/DOM/Entity.h | 5 ++-- XML/include/Poco/DOM/EntityReference.h | 5 ++-- XML/include/Poco/DOM/Event.h | 5 ++-- XML/include/Poco/DOM/EventDispatcher.h | 5 ++-- XML/include/Poco/DOM/EventException.h | 5 ++-- XML/include/Poco/DOM/EventListener.h | 5 ++-- XML/include/Poco/DOM/EventTarget.h | 5 ++-- XML/include/Poco/DOM/MutationEvent.h | 5 ++-- XML/include/Poco/DOM/NamedNodeMap.h | 5 ++-- XML/include/Poco/DOM/Node.h | 5 ++-- XML/include/Poco/DOM/NodeAppender.h | 5 ++-- XML/include/Poco/DOM/NodeFilter.h | 5 ++-- XML/include/Poco/DOM/NodeIterator.h | 5 ++-- XML/include/Poco/DOM/NodeList.h | 5 ++-- XML/include/Poco/DOM/Notation.h | 5 ++-- XML/include/Poco/DOM/ProcessingInstruction.h | 5 ++-- XML/include/Poco/DOM/Text.h | 5 ++-- XML/include/Poco/DOM/TreeWalker.h | 5 ++-- XML/include/Poco/SAX/Attributes.h | 5 ++-- XML/include/Poco/SAX/AttributesImpl.h | 5 ++-- XML/include/Poco/SAX/ContentHandler.h | 5 ++-- XML/include/Poco/SAX/DTDHandler.h | 5 ++-- XML/include/Poco/SAX/DeclHandler.h | 5 ++-- XML/include/Poco/SAX/DefaultHandler.h | 5 ++-- XML/include/Poco/SAX/EntityResolver.h | 5 ++-- XML/include/Poco/SAX/EntityResolverImpl.h | 5 ++-- XML/include/Poco/SAX/ErrorHandler.h | 5 ++-- XML/include/Poco/SAX/InputSource.h | 5 ++-- XML/include/Poco/SAX/LexicalHandler.h | 5 ++-- XML/include/Poco/SAX/Locator.h | 5 ++-- XML/include/Poco/SAX/LocatorImpl.h | 5 ++-- XML/include/Poco/SAX/NamespaceSupport.h | 5 ++-- XML/include/Poco/SAX/SAXException.h | 5 ++-- XML/include/Poco/SAX/SAXParser.h | 5 ++-- XML/include/Poco/SAX/WhitespaceFilter.h | 5 ++-- XML/include/Poco/SAX/XMLFilter.h | 5 ++-- XML/include/Poco/SAX/XMLFilterImpl.h | 5 ++-- XML/include/Poco/SAX/XMLReader.h | 5 ++-- XML/include/Poco/XML/Content.h | 5 ++-- XML/include/Poco/XML/Name.h | 5 ++-- XML/include/Poco/XML/NamePool.h | 5 ++-- XML/include/Poco/XML/NamespaceStrategy.h | 5 ++-- XML/include/Poco/XML/QName.h | 5 ++-- XML/include/Poco/XML/ValueTraits.h | 5 ++-- XML/include/Poco/XML/XMLException.h | 5 ++-- XML/include/Poco/XML/XMLStream.h | 5 ++-- XML/include/Poco/XML/XMLStreamParser.h | 5 ++-- .../Poco/XML/XMLStreamParserException.h | 5 ++-- XML/include/Poco/XML/XMLString.h | 5 ++-- XML/include/Poco/XML/XMLWriter.h | 5 ++-- XML/src/AbstractContainerNode.cpp | 5 ++-- XML/src/AbstractNode.cpp | 5 ++-- XML/src/Attr.cpp | 5 ++-- XML/src/AttrMap.cpp | 5 ++-- XML/src/Attributes.cpp | 5 ++-- XML/src/AttributesImpl.cpp | 5 ++-- XML/src/CDATASection.cpp | 5 ++-- XML/src/CharacterData.cpp | 5 ++-- XML/src/ChildNodesList.cpp | 5 ++-- XML/src/Comment.cpp | 5 ++-- XML/src/ContentHandler.cpp | 5 ++-- XML/src/DOMBuilder.cpp | 5 ++-- XML/src/DOMException.cpp | 5 ++-- XML/src/DOMImplementation.cpp | 5 ++-- XML/src/DOMObject.cpp | 5 ++-- XML/src/DOMParser.cpp | 5 ++-- XML/src/DOMSerializer.cpp | 5 ++-- XML/src/DOMWriter.cpp | 5 ++-- XML/src/DTDHandler.cpp | 5 ++-- XML/src/DTDMap.cpp | 5 ++-- XML/src/DeclHandler.cpp | 5 ++-- XML/src/DefaultHandler.cpp | 5 ++-- XML/src/Document.cpp | 5 ++-- XML/src/DocumentEvent.cpp | 5 ++-- XML/src/DocumentFragment.cpp | 5 ++-- XML/src/DocumentType.cpp | 5 ++-- XML/src/Element.cpp | 5 ++-- XML/src/ElementsByTagNameList.cpp | 5 ++-- XML/src/Entity.cpp | 5 ++-- XML/src/EntityReference.cpp | 5 ++-- XML/src/EntityResolver.cpp | 5 ++-- XML/src/EntityResolverImpl.cpp | 5 ++-- XML/src/ErrorHandler.cpp | 5 ++-- XML/src/Event.cpp | 5 ++-- XML/src/EventDispatcher.cpp | 5 ++-- XML/src/EventException.cpp | 5 ++-- XML/src/EventListener.cpp | 5 ++-- XML/src/EventTarget.cpp | 5 ++-- XML/src/InputSource.cpp | 5 ++-- XML/src/LexicalHandler.cpp | 5 ++-- XML/src/Locator.cpp | 5 ++-- XML/src/LocatorImpl.cpp | 5 ++-- XML/src/MutationEvent.cpp | 5 ++-- XML/src/Name.cpp | 5 ++-- XML/src/NamePool.cpp | 5 ++-- XML/src/NamedNodeMap.cpp | 5 ++-- XML/src/NamespaceStrategy.cpp | 5 ++-- XML/src/NamespaceSupport.cpp | 5 ++-- XML/src/Node.cpp | 5 ++-- XML/src/NodeAppender.cpp | 5 ++-- XML/src/NodeFilter.cpp | 5 ++-- XML/src/NodeIterator.cpp | 5 ++-- XML/src/NodeList.cpp | 5 ++-- XML/src/Notation.cpp | 5 ++-- XML/src/ParserEngine.cpp | 5 ++-- XML/src/ParserEngine.h | 5 ++-- XML/src/ProcessingInstruction.cpp | 5 ++-- XML/src/QName.cpp | 5 ++-- XML/src/SAXException.cpp | 5 ++-- XML/src/SAXParser.cpp | 5 ++-- XML/src/Text.cpp | 5 ++-- XML/src/TreeWalker.cpp | 5 ++-- XML/src/ValueTraits.cpp | 5 ++-- XML/src/WhitespaceFilter.cpp | 5 ++-- XML/src/XMLException.cpp | 5 ++-- XML/src/XMLFilter.cpp | 5 ++-- XML/src/XMLFilterImpl.cpp | 5 ++-- XML/src/XMLReader.cpp | 5 ++-- XML/src/XMLStreamParser.cpp | 5 ++-- XML/src/XMLStreamParserException.cpp | 5 ++-- XML/src/XMLString.cpp | 5 ++-- XML/src/XMLWriter.cpp | 5 ++-- Zip/include/Poco/Zip/Add.h | 5 ++-- Zip/include/Poco/Zip/AutoDetectStream.h | 5 ++-- Zip/include/Poco/Zip/Compress.h | 5 ++-- Zip/include/Poco/Zip/Decompress.h | 5 ++-- Zip/include/Poco/Zip/Delete.h | 5 ++-- Zip/include/Poco/Zip/Keep.h | 5 ++-- Zip/include/Poco/Zip/ParseCallback.h | 5 ++-- Zip/include/Poco/Zip/PartialStream.h | 5 ++-- Zip/include/Poco/Zip/Rename.h | 5 ++-- Zip/include/Poco/Zip/Replace.h | 5 ++-- Zip/include/Poco/Zip/SkipCallback.h | 5 ++-- Zip/include/Poco/Zip/ZipArchive.h | 5 ++-- Zip/include/Poco/Zip/ZipArchiveInfo.h | 5 ++-- Zip/include/Poco/Zip/ZipCommon.h | 5 ++-- Zip/include/Poco/Zip/ZipDataInfo.h | 5 ++-- Zip/include/Poco/Zip/ZipException.h | 5 ++-- Zip/include/Poco/Zip/ZipFileInfo.h | 5 ++-- Zip/include/Poco/Zip/ZipLocalFileHeader.h | 5 ++-- Zip/include/Poco/Zip/ZipManipulator.h | 5 ++-- Zip/include/Poco/Zip/ZipOperation.h | 5 ++-- Zip/include/Poco/Zip/ZipStream.h | 5 ++-- Zip/include/Poco/Zip/ZipUtil.h | 5 ++-- Zip/src/Add.cpp | 5 ++-- Zip/src/AutoDetectStream.cpp | 5 ++-- Zip/src/Compress.cpp | 5 ++-- Zip/src/Decompress.cpp | 5 ++-- Zip/src/Delete.cpp | 5 ++-- Zip/src/Keep.cpp | 5 ++-- Zip/src/ParseCallback.cpp | 5 ++-- Zip/src/PartialStream.cpp | 5 ++-- Zip/src/Rename.cpp | 5 ++-- Zip/src/Replace.cpp | 5 ++-- Zip/src/SkipCallback.cpp | 5 ++-- Zip/src/ZipArchive.cpp | 5 ++-- Zip/src/ZipArchiveInfo.cpp | 5 ++-- Zip/src/ZipCommon.cpp | 5 ++-- Zip/src/ZipDataInfo.cpp | 5 ++-- Zip/src/ZipException.cpp | 5 ++-- Zip/src/ZipFileInfo.cpp | 5 ++-- Zip/src/ZipLocalFileHeader.cpp | 5 ++-- Zip/src/ZipManipulator.cpp | 5 ++-- Zip/src/ZipOperation.cpp | 5 ++-- Zip/src/ZipStream.cpp | 5 ++-- Zip/src/ZipUtil.cpp | 5 ++-- .../src/symbols/dwarf/debug_map_resolver.cpp | 6 ++--- .../src/symbols/dwarf/dwarf_resolver.cpp | 6 ++--- .../src/symbols/symbols_with_addr2line.cpp | 6 ++--- .../src/symbols/symbols_with_dbghelp.cpp | 6 ++--- .../cpptrace/src/symbols/symbols_with_dl.cpp | 6 ++--- .../src/symbols/symbols_with_libbacktrace.cpp | 6 ++--- .../src/symbols/symbols_with_libdwarf.cpp | 6 ++--- .../src/symbols/symbols_with_nothing.cpp | 6 ++--- dependencies/cpptrace/src/utils/microfmt.cpp | 6 ++--- .../tessil/include/Poco/ordered_hash.h | 8 ++---- .../v8_double_conversion/src/cached-powers.h | 8 ++---- 1112 files changed, 2275 insertions(+), 3551 deletions(-) diff --git a/ActiveRecord/Compiler/src/CodeGenerator.cpp b/ActiveRecord/Compiler/src/CodeGenerator.cpp index c318e626dd..2bc7bf18d5 100644 --- a/ActiveRecord/Compiler/src/CodeGenerator.cpp +++ b/ActiveRecord/Compiler/src/CodeGenerator.cpp @@ -16,9 +16,7 @@ using namespace std::string_literals; -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { CodeGenerator::CodeGenerator(const std::string& source, std::ostream& stream): @@ -164,4 +162,4 @@ std::string CodeGenerator::fullClassName(const Class& clazz) const } -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler diff --git a/ActiveRecord/Compiler/src/CodeGenerator.h b/ActiveRecord/Compiler/src/CodeGenerator.h index 043bd22c11..bf1797a0c3 100644 --- a/ActiveRecord/Compiler/src/CodeGenerator.h +++ b/ActiveRecord/Compiler/src/CodeGenerator.h @@ -17,9 +17,7 @@ #include -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { class CodeGenerator @@ -65,7 +63,7 @@ inline const std::string& CodeGenerator::source() const } -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler #endif // ActiveRecordCompiler_CodeGenerator_INCLUDED diff --git a/ActiveRecord/Compiler/src/Compiler.cpp b/ActiveRecord/Compiler/src/Compiler.cpp index 6fca2d9bcf..0bea043afe 100644 --- a/ActiveRecord/Compiler/src/Compiler.cpp +++ b/ActiveRecord/Compiler/src/Compiler.cpp @@ -32,9 +32,7 @@ using Poco::Util::HelpFormatter; using Poco::Util::OptionCallback; -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { class CompilerApp: public Application @@ -228,7 +226,7 @@ class CompilerApp: public Application }; -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler POCO_APP_MAIN(Poco::ActiveRecord::Compiler::CompilerApp) diff --git a/ActiveRecord/Compiler/src/HeaderGenerator.cpp b/ActiveRecord/Compiler/src/HeaderGenerator.cpp index 915741bff2..3529c654c0 100644 --- a/ActiveRecord/Compiler/src/HeaderGenerator.cpp +++ b/ActiveRecord/Compiler/src/HeaderGenerator.cpp @@ -15,9 +15,7 @@ using namespace std::string_literals; -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { HeaderGenerator::HeaderGenerator(const std::string& source, std::ostream& stream, const Class& clazz, const ClassMap& classes): @@ -348,4 +346,4 @@ const Class& HeaderGenerator::referencedClass(const Property& property) const } -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler diff --git a/ActiveRecord/Compiler/src/HeaderGenerator.h b/ActiveRecord/Compiler/src/HeaderGenerator.h index e91e012ac7..66fac7105c 100644 --- a/ActiveRecord/Compiler/src/HeaderGenerator.h +++ b/ActiveRecord/Compiler/src/HeaderGenerator.h @@ -16,9 +16,7 @@ #include "Types.h" -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { class HeaderGenerator: public CodeGenerator @@ -53,7 +51,7 @@ class HeaderGenerator: public CodeGenerator }; -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler #endif // ActiveRecordCompiler_HeaderGenerator_INCLUDED diff --git a/ActiveRecord/Compiler/src/ImplGenerator.cpp b/ActiveRecord/Compiler/src/ImplGenerator.cpp index 3a550cba90..0f02b0f6b3 100644 --- a/ActiveRecord/Compiler/src/ImplGenerator.cpp +++ b/ActiveRecord/Compiler/src/ImplGenerator.cpp @@ -15,9 +15,7 @@ using namespace std::string_literals; -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { ImplGenerator::ImplGenerator(const std::string& source, std::ostream& stream, const Class& clazz, const ClassMap& classes): @@ -415,4 +413,4 @@ const Class& ImplGenerator::referencedClass(const Property& property) const } -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler diff --git a/ActiveRecord/Compiler/src/ImplGenerator.h b/ActiveRecord/Compiler/src/ImplGenerator.h index 63aea23ced..6ee0a74338 100644 --- a/ActiveRecord/Compiler/src/ImplGenerator.h +++ b/ActiveRecord/Compiler/src/ImplGenerator.h @@ -16,9 +16,7 @@ #include "Types.h" -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { class ImplGenerator: public CodeGenerator @@ -50,7 +48,7 @@ class ImplGenerator: public CodeGenerator }; -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler #endif // ActiveRecordCompiler_ImplGenerator_INCLUDED diff --git a/ActiveRecord/Compiler/src/Parser.cpp b/ActiveRecord/Compiler/src/Parser.cpp index 94401f9950..493b582984 100644 --- a/ActiveRecord/Compiler/src/Parser.cpp +++ b/ActiveRecord/Compiler/src/Parser.cpp @@ -21,9 +21,7 @@ using namespace std::string_literals; -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { Parser::Parser() @@ -274,4 +272,4 @@ std::string Parser::toDatabaseName(const std::string& name) } -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler diff --git a/ActiveRecord/Compiler/src/Parser.h b/ActiveRecord/Compiler/src/Parser.h index 9b639a7733..9fb62b57cd 100644 --- a/ActiveRecord/Compiler/src/Parser.h +++ b/ActiveRecord/Compiler/src/Parser.h @@ -17,9 +17,7 @@ #include -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { class Parser: protected Poco::XML::DefaultHandler @@ -57,7 +55,7 @@ class Parser: protected Poco::XML::DefaultHandler }; -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler #endif // ActiveRecordCompiler_Parser_INCLUDED diff --git a/ActiveRecord/Compiler/src/Types.h b/ActiveRecord/Compiler/src/Types.h index 6afb71524b..2aff41c398 100644 --- a/ActiveRecord/Compiler/src/Types.h +++ b/ActiveRecord/Compiler/src/Types.h @@ -17,9 +17,7 @@ #include -namespace Poco { -namespace ActiveRecord { -namespace Compiler { +namespace Poco::ActiveRecord::Compiler { struct Property @@ -54,7 +52,7 @@ struct Class using ClassMap = std::map; -} } } // namespace Poco::ActiveRecord::Compiler +} // namespace Poco::ActiveRecord::Compiler #endif // ActiveRecordCompiler_Types_INCLUDED diff --git a/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h b/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h index be932c5722..d607b7cf36 100644 --- a/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h +++ b/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { class ActiveRecordLib_API ActiveRecordBase: public Poco::RefCountedObject @@ -272,7 +271,7 @@ IDType ActiveRecord::lastInsertID(Poco::Data::Session& session) } -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord #endif // ActiveRecord_ActiveRecord_INCLUDED diff --git a/ActiveRecord/include/Poco/ActiveRecord/Context.h b/ActiveRecord/include/Poco/ActiveRecord/Context.h index bb5cda0a39..0cca334cf7 100644 --- a/ActiveRecord/include/Poco/ActiveRecord/Context.h +++ b/ActiveRecord/include/Poco/ActiveRecord/Context.h @@ -23,8 +23,7 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { class ActiveRecordLib_API Context: public Poco::RefCountedObject @@ -68,7 +67,7 @@ inline Poco::Data::Session& Context::session() } -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord #endif // ActiveRecord_Context_INCLUDED diff --git a/ActiveRecord/include/Poco/ActiveRecord/IDTraits.h b/ActiveRecord/include/Poco/ActiveRecord/IDTraits.h index 3d8b155abc..3182b9ada4 100644 --- a/ActiveRecord/include/Poco/ActiveRecord/IDTraits.h +++ b/ActiveRecord/include/Poco/ActiveRecord/IDTraits.h @@ -22,8 +22,7 @@ #include "Poco/NumberFormatter.h" -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { template @@ -178,7 +177,7 @@ class IDTraits }; -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord #endif // ActiveRecord_IDTraits_INCLUDED diff --git a/ActiveRecord/include/Poco/ActiveRecord/Query.h b/ActiveRecord/include/Poco/ActiveRecord/Query.h index 4b20907fe1..bd6f5849c7 100644 --- a/ActiveRecord/include/Poco/ActiveRecord/Query.h +++ b/ActiveRecord/include/Poco/ActiveRecord/Query.h @@ -22,8 +22,7 @@ #include "Poco/Data/Statement.h" -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { template @@ -229,7 +228,7 @@ class Query }; -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord #endif // ActiveRecord_select_INCLUDED diff --git a/ActiveRecord/include/Poco/ActiveRecord/StatementPlaceholderProvider.h b/ActiveRecord/include/Poco/ActiveRecord/StatementPlaceholderProvider.h index 5273f4b67e..9ce2e6d767 100644 --- a/ActiveRecord/include/Poco/ActiveRecord/StatementPlaceholderProvider.h +++ b/ActiveRecord/include/Poco/ActiveRecord/StatementPlaceholderProvider.h @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { class ActiveRecordLib_API StatementPlaceholderProvider @@ -56,7 +55,7 @@ class ActiveRecordLib_API PostgresStatementPlaceholderProvider: public Statement }; -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord #endif // ActiveRecord_StatementPlaceholderProvider_INCLUDED diff --git a/ActiveRecord/src/ActiveRecord.cpp b/ActiveRecord/src/ActiveRecord.cpp index 3fb359e378..fd6fe6e2e0 100644 --- a/ActiveRecord/src/ActiveRecord.cpp +++ b/ActiveRecord/src/ActiveRecord.cpp @@ -21,8 +21,7 @@ using namespace Poco::Data::Keywords; using namespace std::string_literals; -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { void ActiveRecordBase::attach(Context::Ptr pContext) @@ -59,4 +58,4 @@ std::string KeylessActiveRecord::toString() const } -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord diff --git a/ActiveRecord/src/Context.cpp b/ActiveRecord/src/Context.cpp index d3231a337b..00cbf2d2ff 100644 --- a/ActiveRecord/src/Context.cpp +++ b/ActiveRecord/src/Context.cpp @@ -18,8 +18,7 @@ using namespace std::string_literals; -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { Context::Context(const Poco::Data::Session& session): @@ -43,4 +42,4 @@ StatementPlaceholderProvider::Ptr Context::statementPlaceholderProvider() const } -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord diff --git a/ActiveRecord/src/IDTraits.cpp b/ActiveRecord/src/IDTraits.cpp index e4140f9a13..1a0b199e3e 100644 --- a/ActiveRecord/src/IDTraits.cpp +++ b/ActiveRecord/src/IDTraits.cpp @@ -15,12 +15,11 @@ #include "Poco/ActiveRecord/IDTraits.h" -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { const std::string IDTraits::INVALID_ID; const Poco::UUID IDTraits::INVALID_ID; -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord diff --git a/ActiveRecord/src/StatementPlaceholderProvider.cpp b/ActiveRecord/src/StatementPlaceholderProvider.cpp index 85e6140c27..0cf5d32f5b 100644 --- a/ActiveRecord/src/StatementPlaceholderProvider.cpp +++ b/ActiveRecord/src/StatementPlaceholderProvider.cpp @@ -19,8 +19,7 @@ using namespace std::string_literals; -namespace Poco { -namespace ActiveRecord { +namespace Poco::ActiveRecord { StatementPlaceholderProvider::~StatementPlaceholderProvider() @@ -51,4 +50,4 @@ std::string PostgresStatementPlaceholderProvider::next() } -} } // namespace Poco::ActiveRecord +} // namespace Poco::ActiveRecord diff --git a/ActiveRecord/testsuite/include/ORM/Employee.h b/ActiveRecord/testsuite/include/ORM/Employee.h index 2310dbb0e4..6c1ff22533 100644 --- a/ActiveRecord/testsuite/include/ORM/Employee.h +++ b/ActiveRecord/testsuite/include/ORM/Employee.h @@ -116,8 +116,7 @@ inline Employee& Employee::managerID(const Poco::UUID& value) } // namespace ORM -namespace Poco { -namespace Data { +namespace Poco::Data { template <> @@ -155,7 +154,7 @@ class TypeHandler }; -} } // namespace Poco::Data +} // namespace Poco::Data #endif // ORM_Employee_INCLUDED diff --git a/ActiveRecord/testsuite/include/ORM/Role.h b/ActiveRecord/testsuite/include/ORM/Role.h index eb86583251..996b925a26 100644 --- a/ActiveRecord/testsuite/include/ORM/Role.h +++ b/ActiveRecord/testsuite/include/ORM/Role.h @@ -77,8 +77,7 @@ inline Role& Role::description(const std::string& value) } // namespace ORM -namespace Poco { -namespace Data { +namespace Poco::Data { template <> @@ -110,7 +109,7 @@ class TypeHandler }; -} } // namespace Poco::Data +} // namespace Poco::Data #endif // ORM_Role_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Attributes.h b/CppParser/include/Poco/CppParser/Attributes.h index e127ad55bf..95993d66f4 100644 --- a/CppParser/include/Poco/CppParser/Attributes.h +++ b/CppParser/include/Poco/CppParser/Attributes.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API Attributes @@ -117,7 +116,7 @@ inline Attributes::Iterator Attributes::end() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Attributes_INCLUDED diff --git a/CppParser/include/Poco/CppParser/AttributesParser.h b/CppParser/include/Poco/CppParser/AttributesParser.h index 2cbeee8e83..65c82fc0d1 100644 --- a/CppParser/include/Poco/CppParser/AttributesParser.h +++ b/CppParser/include/Poco/CppParser/AttributesParser.h @@ -23,8 +23,7 @@ #include "Poco/CppParser/Attributes.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API AttributesParser @@ -108,7 +107,7 @@ inline bool AttributesParser::isLiteral(const Poco::Token* pToken) } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_AttributesParser_INCLUDED diff --git a/CppParser/include/Poco/CppParser/BuiltIn.h b/CppParser/include/Poco/CppParser/BuiltIn.h index 666cd70573..570c7c4fcf 100644 --- a/CppParser/include/Poco/CppParser/BuiltIn.h +++ b/CppParser/include/Poco/CppParser/BuiltIn.h @@ -22,8 +22,7 @@ #include "Poco/CppParser/Symbol.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API BuiltIn: public Symbol @@ -41,7 +40,7 @@ class CppParser_API BuiltIn: public Symbol }; -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_BuiltIn_INCLUDED diff --git a/CppParser/include/Poco/CppParser/CppToken.h b/CppParser/include/Poco/CppParser/CppToken.h index 2de5891f4a..874aa3b483 100644 --- a/CppParser/include/Poco/CppParser/CppToken.h +++ b/CppParser/include/Poco/CppParser/CppToken.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API CppToken: public Poco::Token @@ -286,7 +285,7 @@ class CppParser_API PreprocessorToken: public CppToken }; -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_CppToken_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Decl.h b/CppParser/include/Poco/CppParser/Decl.h index d8b89d1ea2..de687c78a9 100644 --- a/CppParser/include/Poco/CppParser/Decl.h +++ b/CppParser/include/Poco/CppParser/Decl.h @@ -22,8 +22,7 @@ #include "Poco/CppParser/Symbol.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API Decl: public Symbol @@ -56,7 +55,7 @@ inline const std::string& Decl::declaration() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Decl_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Enum.h b/CppParser/include/Poco/CppParser/Enum.h index 046a2117e5..ddfda112a7 100644 --- a/CppParser/include/Poco/CppParser/Enum.h +++ b/CppParser/include/Poco/CppParser/Enum.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class EnumValue; @@ -106,7 +105,7 @@ inline int Enum::flags() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Enum_INCLUDED diff --git a/CppParser/include/Poco/CppParser/EnumValue.h b/CppParser/include/Poco/CppParser/EnumValue.h index f0e082fe82..41b3e8c965 100644 --- a/CppParser/include/Poco/CppParser/EnumValue.h +++ b/CppParser/include/Poco/CppParser/EnumValue.h @@ -22,8 +22,7 @@ #include "Poco/CppParser/Symbol.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class Enum; @@ -60,7 +59,7 @@ inline const std::string& EnumValue::value() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_EnumValue_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Function.h b/CppParser/include/Poco/CppParser/Function.h index b26e26e901..b756a797ae 100644 --- a/CppParser/include/Poco/CppParser/Function.h +++ b/CppParser/include/Poco/CppParser/Function.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class Parameter; @@ -187,7 +186,7 @@ inline bool Function::isStatic() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Function_INCLUDED diff --git a/CppParser/include/Poco/CppParser/NameSpace.h b/CppParser/include/Poco/CppParser/NameSpace.h index cc3383e9a8..a843c3ed9e 100644 --- a/CppParser/include/Poco/CppParser/NameSpace.h +++ b/CppParser/include/Poco/CppParser/NameSpace.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API NameSpace: public Symbol @@ -135,7 +134,7 @@ inline const NameSpace::NameSpaceVec& NameSpace::importedNameSpaces() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_NameSpace_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Parameter.h b/CppParser/include/Poco/CppParser/Parameter.h index 61de6c0e2f..5a1ff416a3 100644 --- a/CppParser/include/Poco/CppParser/Parameter.h +++ b/CppParser/include/Poco/CppParser/Parameter.h @@ -22,8 +22,7 @@ #include "Poco/CppParser/Decl.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class Function; @@ -136,7 +135,7 @@ inline const std::string& Parameter::defaultDecl() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Parameter_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Parser.h b/CppParser/include/Poco/CppParser/Parser.h index adf387eb18..6bf9eb9dfd 100644 --- a/CppParser/include/Poco/CppParser/Parser.h +++ b/CppParser/include/Poco/CppParser/Parser.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class Enum; @@ -124,7 +123,7 @@ class CppParser_API Parser }; -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Parser_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Struct.h b/CppParser/include/Poco/CppParser/Struct.h index 6983cab403..81f62a03ba 100644 --- a/CppParser/include/Poco/CppParser/Struct.h +++ b/CppParser/include/Poco/CppParser/Struct.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class Function; @@ -202,7 +201,7 @@ inline bool Struct::isDerived() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Struct_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Symbol.h b/CppParser/include/Poco/CppParser/Symbol.h index a797a5d85e..1383bacdae 100644 --- a/CppParser/include/Poco/CppParser/Symbol.h +++ b/CppParser/include/Poco/CppParser/Symbol.h @@ -23,8 +23,7 @@ #include "Poco/Foundation.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class NameSpace; @@ -290,7 +289,7 @@ inline bool Symbol::isPrivate() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Symbol_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Tokenizer.h b/CppParser/include/Poco/CppParser/Tokenizer.h index 8a59d1d8cc..f77aa850e9 100644 --- a/CppParser/include/Poco/CppParser/Tokenizer.h +++ b/CppParser/include/Poco/CppParser/Tokenizer.h @@ -22,8 +22,7 @@ #include "Poco/StreamTokenizer.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API Tokenizer: public Poco::StreamTokenizer @@ -38,7 +37,7 @@ class CppParser_API Tokenizer: public Poco::StreamTokenizer }; -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Tokenizer_INCLUDED diff --git a/CppParser/include/Poco/CppParser/TypeDef.h b/CppParser/include/Poco/CppParser/TypeDef.h index 0a0d87be63..70c01b3033 100644 --- a/CppParser/include/Poco/CppParser/TypeDef.h +++ b/CppParser/include/Poco/CppParser/TypeDef.h @@ -22,8 +22,7 @@ #include "Poco/CppParser/Decl.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API TypeDef: public Decl @@ -60,7 +59,7 @@ class CppParser_API TypeAlias: public Decl }; -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_TypeDef_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Utility.h b/CppParser/include/Poco/CppParser/Utility.h index 8fa9267b8b..0cc3ed30f7 100644 --- a/CppParser/include/Poco/CppParser/Utility.h +++ b/CppParser/include/Poco/CppParser/Utility.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API Utility @@ -79,7 +78,7 @@ std::string CppParser_API replace(const std::string& input, const std::string& o /// Replaces in character input all oldTokens with the newToken -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Utility_INCLUDED diff --git a/CppParser/include/Poco/CppParser/Variable.h b/CppParser/include/Poco/CppParser/Variable.h index a33607fcb0..1993bd78a3 100644 --- a/CppParser/include/Poco/CppParser/Variable.h +++ b/CppParser/include/Poco/CppParser/Variable.h @@ -22,8 +22,7 @@ #include "Poco/CppParser/Decl.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class CppParser_API Variable: public Decl @@ -103,7 +102,7 @@ inline const std::string& Variable::declType() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser #endif // CppParser_Variable_INCLUDED diff --git a/CppParser/src/Attributes.cpp b/CppParser/src/Attributes.cpp index 5507d20cfc..e6a76a9a59 100644 --- a/CppParser/src/Attributes.cpp +++ b/CppParser/src/Attributes.cpp @@ -21,8 +21,7 @@ using Poco::NumberParser; -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { Attributes::Attributes() @@ -151,4 +150,4 @@ void Attributes::clear() } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/AttributesParser.cpp b/CppParser/src/AttributesParser.cpp index ef8eb3dc15..ea0596ca0d 100644 --- a/CppParser/src/AttributesParser.cpp +++ b/CppParser/src/AttributesParser.cpp @@ -21,8 +21,7 @@ using Poco::Token; using Poco::SyntaxException; -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { AttributesParser::AttributesParser(Attributes& attrs, std::istream& istr): @@ -144,4 +143,4 @@ void AttributesParser::setAttribute(const std::string& name, const std::string& } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/BuiltIn.cpp b/CppParser/src/BuiltIn.cpp index c0f472cff4..dd5a3deb14 100644 --- a/CppParser/src/BuiltIn.cpp +++ b/CppParser/src/BuiltIn.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { BuiltIn::BuiltIn(const std::string& name, NameSpace* pNameSpace): @@ -44,4 +43,4 @@ std::string BuiltIn::toString() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/CppToken.cpp b/CppParser/src/CppToken.cpp index 17a4f3175f..6f40657ace 100644 --- a/CppParser/src/CppToken.cpp +++ b/CppParser/src/CppToken.cpp @@ -23,8 +23,7 @@ using Poco::Token; using Poco::SyntaxException; -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { CppToken::CppToken() @@ -866,5 +865,5 @@ void PreprocessorToken::finish(std::istream& istr) } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Decl.cpp b/CppParser/src/Decl.cpp index 0821b2e5a3..7b55a82c00 100644 --- a/CppParser/src/Decl.cpp +++ b/CppParser/src/Decl.cpp @@ -16,8 +16,7 @@ #include "Poco/String.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { Decl::Decl(const std::string& decl, NameSpace* pNameSpace): @@ -38,5 +37,5 @@ std::string Decl::toString() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Enum.cpp b/CppParser/src/Enum.cpp index 51f81fd56d..f35575acbc 100644 --- a/CppParser/src/Enum.cpp +++ b/CppParser/src/Enum.cpp @@ -21,8 +21,7 @@ using Poco::NumberFormatter; -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { int Enum::_count = 0; @@ -103,4 +102,4 @@ std::string Enum::toString() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/EnumValue.cpp b/CppParser/src/EnumValue.cpp index 987ff80388..47bc567d99 100644 --- a/CppParser/src/EnumValue.cpp +++ b/CppParser/src/EnumValue.cpp @@ -16,8 +16,7 @@ #include "Poco/CppParser/Enum.h" -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { EnumValue::EnumValue(const std::string& name, const std::string& value, Enum* pEnum): @@ -51,4 +50,4 @@ std::string EnumValue::toString() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Function.cpp b/CppParser/src/Function.cpp index e2f4260dcf..292f0c6ba8 100644 --- a/CppParser/src/Function.cpp +++ b/CppParser/src/Function.cpp @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { Function::Function(const std::string& decl, NameSpace* pNameSpace): @@ -252,4 +251,4 @@ std::string Function::toString() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/NameSpace.cpp b/CppParser/src/NameSpace.cpp index 231ea48bfc..732b11b23e 100644 --- a/CppParser/src/NameSpace.cpp +++ b/CppParser/src/NameSpace.cpp @@ -22,8 +22,7 @@ using Poco::ExistsException; using Poco::NotFoundException; -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { NameSpace::NameSpace() @@ -250,4 +249,4 @@ void NameSpace::extract(Symbol::Kind kind, SymbolTable& table) const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Parameter.cpp b/CppParser/src/Parameter.cpp index 8df8b7501e..f9e3c52b7c 100644 --- a/CppParser/src/Parameter.cpp +++ b/CppParser/src/Parameter.cpp @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { int Parameter::_count(0); @@ -147,4 +146,4 @@ std::string Parameter::handleDecl(const std::string& decl) } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp index 85b38a8be4..f77cdd7f74 100644 --- a/CppParser/src/Parser.cpp +++ b/CppParser/src/Parser.cpp @@ -42,8 +42,7 @@ using Poco::trimInPlace; using namespace std::string_literals; -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { // Context-sensitive identifiers (not reserved keywords in C++, @@ -1176,4 +1175,4 @@ const Token* Parser::nextToken() } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Struct.cpp b/CppParser/src/Struct.cpp index c1ae368ec3..d36aade2c2 100644 --- a/CppParser/src/Struct.cpp +++ b/CppParser/src/Struct.cpp @@ -20,8 +20,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { Struct::Struct(const std::string& decl, bool isClass, NameSpace* pNameSpace): @@ -276,4 +275,4 @@ Symbol* Struct::lookup(const std::string& name) const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Symbol.cpp b/CppParser/src/Symbol.cpp index f71f28c286..a4ed73280c 100644 --- a/CppParser/src/Symbol.cpp +++ b/CppParser/src/Symbol.cpp @@ -20,8 +20,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { int Symbol::_nextId = 0; @@ -286,4 +285,4 @@ const Attributes& Symbol::getAttributes() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Tokenizer.cpp b/CppParser/src/Tokenizer.cpp index a51258584c..10c00654bf 100644 --- a/CppParser/src/Tokenizer.cpp +++ b/CppParser/src/Tokenizer.cpp @@ -20,8 +20,7 @@ using Poco::StreamTokenizer; using Poco::WhitespaceToken; -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { Tokenizer::Tokenizer(std::istream& istr): @@ -43,4 +42,4 @@ Tokenizer::~Tokenizer() } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/TypeDef.cpp b/CppParser/src/TypeDef.cpp index a8d0150879..def65c9965 100644 --- a/CppParser/src/TypeDef.cpp +++ b/CppParser/src/TypeDef.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { TypeDef::TypeDef(const std::string& decl, NameSpace* pNameSpace): @@ -88,4 +87,4 @@ std::string TypeAlias::baseType() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Utility.cpp b/CppParser/src/Utility.cpp index c6017a01be..644856dafc 100644 --- a/CppParser/src/Utility.cpp +++ b/CppParser/src/Utility.cpp @@ -38,8 +38,7 @@ using Poco::NumberFormatter; using Poco::Exception; -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { void Utility::parseDir(const std::vector & includePattern, const std::vector & excludePattern, NameSpace::SymbolTable& st, const std::string& exec, const std::string& options, const std::string& path) @@ -297,4 +296,4 @@ std::string replace(const std::string& input, const std::string& oldToken, const return result; } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/CppParser/src/Variable.cpp b/CppParser/src/Variable.cpp index 5062e80339..8e1731d618 100644 --- a/CppParser/src/Variable.cpp +++ b/CppParser/src/Variable.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { Variable::Variable(const std::string& decl, NameSpace* pNameSpace): @@ -73,4 +72,4 @@ Symbol::Kind Variable::kind() const } -} } // namespace Poco::CppParser +} // namespace Poco::CppParser diff --git a/Crypto/include/Poco/Crypto/Cipher.h b/Crypto/include/Poco/Crypto/Cipher.h index c0a6188fc2..b59010ba01 100644 --- a/Crypto/include/Poco/Crypto/Cipher.h +++ b/Crypto/include/Poco/Crypto/Cipher.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API Cipher: public Poco::RefCountedObject @@ -129,7 +128,7 @@ class Crypto_API Cipher: public Poco::RefCountedObject }; -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_Cipher_INCLUDED diff --git a/Crypto/include/Poco/Crypto/CipherFactory.h b/Crypto/include/Poco/Crypto/CipherFactory.h index 5202e3f70e..a01145525b 100644 --- a/Crypto/include/Poco/Crypto/CipherFactory.h +++ b/Crypto/include/Poco/Crypto/CipherFactory.h @@ -21,8 +21,7 @@ #include "Poco/Crypto/Crypto.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Cipher; @@ -74,7 +73,7 @@ class Crypto_API CipherFactory }; -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_CipherFactory_INCLUDED diff --git a/Crypto/include/Poco/Crypto/CipherImpl.h b/Crypto/include/Poco/Crypto/CipherImpl.h index 49a7476f83..146b921b8f 100644 --- a/Crypto/include/Poco/Crypto/CipherImpl.h +++ b/Crypto/include/Poco/Crypto/CipherImpl.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class CipherImpl: public Cipher @@ -63,7 +62,7 @@ inline const std::string& CipherImpl::name() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_CipherImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/CipherKey.h b/Crypto/include/Poco/Crypto/CipherKey.h index 3585564685..05025accf8 100644 --- a/Crypto/include/Poco/Crypto/CipherKey.h +++ b/Crypto/include/Poco/Crypto/CipherKey.h @@ -22,8 +22,7 @@ #include "Poco/Crypto/CipherKeyImpl.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API CipherKey @@ -207,7 +206,7 @@ inline CipherKeyImpl::Ptr CipherKey::impl() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_CipherKey_INCLUDED diff --git a/Crypto/include/Poco/Crypto/CipherKeyImpl.h b/Crypto/include/Poco/Crypto/CipherKeyImpl.h index 4139ab7358..a2e33f0f7c 100644 --- a/Crypto/include/Poco/Crypto/CipherKeyImpl.h +++ b/Crypto/include/Poco/Crypto/CipherKeyImpl.h @@ -29,8 +29,7 @@ struct evp_cipher_st; typedef struct evp_cipher_st EVP_CIPHER; -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API CipherKeyImpl: public RefCountedObject @@ -162,7 +161,7 @@ inline const EVP_CIPHER* CipherKeyImpl::cipher() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_CipherKeyImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h index 128add33f2..c759e61697 100644 --- a/Crypto/include/Poco/Crypto/Crypto.h +++ b/Crypto/include/Poco/Crypto/Crypto.h @@ -107,8 +107,7 @@ enum RSAPaddingMode #endif -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { inline std::string& getError(std::string& msg) @@ -146,7 +145,7 @@ void Crypto_API uninitializeCrypto(); /// OpenSSLInitializer::uninitialize(). -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_Crypto_INCLUDED diff --git a/Crypto/include/Poco/Crypto/CryptoException.h b/Crypto/include/Poco/Crypto/CryptoException.h index 8bd5b011c4..5b2969b89f 100644 --- a/Crypto/include/Poco/Crypto/CryptoException.h +++ b/Crypto/include/Poco/Crypto/CryptoException.h @@ -23,8 +23,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { POCO_DECLARE_EXCEPTION(Crypto_API, CryptoException, Poco::Exception) @@ -50,7 +49,7 @@ class Crypto_API OpenSSLException : public CryptoException }; -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_CryptoException_INCLUDED diff --git a/Crypto/include/Poco/Crypto/CryptoStream.h b/Crypto/include/Poco/Crypto/CryptoStream.h index 8a4c55c23e..d9eb5c82aa 100644 --- a/Crypto/include/Poco/Crypto/CryptoStream.h +++ b/Crypto/include/Poco/Crypto/CryptoStream.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class CryptoTransform; @@ -187,7 +186,7 @@ class Crypto_API EncryptingOutputStream: public CryptoIOS, public std::ostream }; -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_CryptoStream_INCLUDED diff --git a/Crypto/include/Poco/Crypto/CryptoTransform.h b/Crypto/include/Poco/Crypto/CryptoTransform.h index 8be4504158..688e6b166b 100644 --- a/Crypto/include/Poco/Crypto/CryptoTransform.h +++ b/Crypto/include/Poco/Crypto/CryptoTransform.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API CryptoTransform @@ -84,7 +83,7 @@ class Crypto_API CryptoTransform }; -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_CryptoTransform_INCLUDED diff --git a/Crypto/include/Poco/Crypto/DigestEngine.h b/Crypto/include/Poco/Crypto/DigestEngine.h index 1c30e769d5..657b92dbfd 100644 --- a/Crypto/include/Poco/Crypto/DigestEngine.h +++ b/Crypto/include/Poco/Crypto/DigestEngine.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API DigestEngine: public Poco::DigestEngine @@ -74,7 +73,7 @@ inline const std::string& DigestEngine::algorithm() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_DigestEngine_INCLUDED diff --git a/Crypto/include/Poco/Crypto/ECDSADigestEngine.h b/Crypto/include/Poco/Crypto/ECDSADigestEngine.h index a3d8156fef..57e32923dc 100644 --- a/Crypto/include/Poco/Crypto/ECDSADigestEngine.h +++ b/Crypto/include/Poco/Crypto/ECDSADigestEngine.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API ECDSADigestEngine: public Poco::DigestEngine @@ -124,7 +123,7 @@ class Crypto_API ECDSASignature }; -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_ECDSADigestEngine_INCLUDED diff --git a/Crypto/include/Poco/Crypto/ECKey.h b/Crypto/include/Poco/Crypto/ECKey.h index f74cbfdc31..62397f6405 100644 --- a/Crypto/include/Poco/Crypto/ECKey.h +++ b/Crypto/include/Poco/Crypto/ECKey.h @@ -24,8 +24,7 @@ #include "Poco/Crypto/ECKeyImpl.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class X509Certificate; @@ -140,7 +139,7 @@ inline bool ECKey::hasCurve(const std::string& name) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_ECKey_INCLUDED diff --git a/Crypto/include/Poco/Crypto/ECKeyImpl.h b/Crypto/include/Poco/Crypto/ECKeyImpl.h index 7110faa22b..d98bcc2aee 100644 --- a/Crypto/include/Poco/Crypto/ECKeyImpl.h +++ b/Crypto/include/Poco/Crypto/ECKeyImpl.h @@ -30,8 +30,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class X509Certificate; @@ -166,7 +165,7 @@ inline void ECKeyImpl::save(std::ostream* pPublicKeyStream, } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_ECKeyImplImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/EVPCipherImpl.h b/Crypto/include/Poco/Crypto/EVPCipherImpl.h index b85d7eaaa1..5c8e014147 100644 --- a/Crypto/include/Poco/Crypto/EVPCipherImpl.h +++ b/Crypto/include/Poco/Crypto/EVPCipherImpl.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class EVPCipherImpl: public Cipher @@ -70,7 +69,7 @@ inline const std::string& EVPCipherImpl::name() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_EVPCipherImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/EVPPKey.h b/Crypto/include/Poco/Crypto/EVPPKey.h index 3170282a1f..9b52906472 100644 --- a/Crypto/include/Poco/Crypto/EVPPKey.h +++ b/Crypto/include/Poco/Crypto/EVPPKey.h @@ -31,8 +31,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { //class [[deprecated]] ECKey; //class [[deprecated]] RSAKey; @@ -395,7 +394,7 @@ inline EVPPKey::operator EVP_PKEY*() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_EVPPKeyImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/Envelope.h b/Crypto/include/Poco/Crypto/Envelope.h index 5102de3d59..d791c2e1d7 100644 --- a/Crypto/include/Poco/Crypto/Envelope.h +++ b/Crypto/include/Poco/Crypto/Envelope.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API Envelope @@ -168,7 +167,7 @@ inline int Envelope::cipherNID() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_Envelope_INCLUDED diff --git a/Crypto/include/Poco/Crypto/KeyPair.h b/Crypto/include/Poco/Crypto/KeyPair.h index de12bddc86..c4643e9aa4 100644 --- a/Crypto/include/Poco/Crypto/KeyPair.h +++ b/Crypto/include/Poco/Crypto/KeyPair.h @@ -22,8 +22,7 @@ #include "Poco/Crypto/KeyPairImpl.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class X509Certificate; @@ -138,7 +137,7 @@ inline KeyPair::Type KeyPair::type() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_KeyPair_INCLUDED diff --git a/Crypto/include/Poco/Crypto/KeyPairImpl.h b/Crypto/include/Poco/Crypto/KeyPairImpl.h index c90385c906..8cd680c1de 100644 --- a/Crypto/include/Poco/Crypto/KeyPairImpl.h +++ b/Crypto/include/Poco/Crypto/KeyPairImpl.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API KeyPairImpl: public Poco::RefCountedObject @@ -101,7 +100,7 @@ inline KeyPairImpl::Type KeyPairImpl::type() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_KeyPairImplImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h index 2621e830b4..ed1b72abd5 100644 --- a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h +++ b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h @@ -27,8 +27,7 @@ #endif -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API OpenSSLInitializer @@ -104,7 +103,7 @@ inline bool OpenSSLInitializer::haveLegacyProvider() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_OpenSSLInitializer_INCLUDED diff --git a/Crypto/include/Poco/Crypto/PKCS12Container.h b/Crypto/include/Poco/Crypto/PKCS12Container.h index 186a8ea9ee..369219b028 100644 --- a/Crypto/include/Poco/Crypto/PKCS12Container.h +++ b/Crypto/include/Poco/Crypto/PKCS12Container.h @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API PKCS12Container @@ -145,7 +144,7 @@ inline EVPPKey PKCS12Container::getKey() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_PKCS12Container_INCLUDED diff --git a/Crypto/include/Poco/Crypto/RSACipherImpl.h b/Crypto/include/Poco/Crypto/RSACipherImpl.h index e71c8fad02..5fc9f10bfb 100644 --- a/Crypto/include/Poco/Crypto/RSACipherImpl.h +++ b/Crypto/include/Poco/Crypto/RSACipherImpl.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class RSACipherImpl: public Cipher @@ -71,7 +70,7 @@ inline const std::string& RSACipherImpl::name() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_RSACipherImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/RSADigestEngine.h b/Crypto/include/Poco/Crypto/RSADigestEngine.h index 8c9d1224ce..bbddf55abc 100644 --- a/Crypto/include/Poco/Crypto/RSADigestEngine.h +++ b/Crypto/include/Poco/Crypto/RSADigestEngine.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API RSADigestEngine: public Poco::DigestEngine @@ -105,7 +104,7 @@ class Crypto_API RSADigestEngine: public Poco::DigestEngine }; -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_RSADigestEngine_INCLUDED diff --git a/Crypto/include/Poco/Crypto/RSAKey.h b/Crypto/include/Poco/Crypto/RSAKey.h index 85fee5b529..fe495b68f6 100644 --- a/Crypto/include/Poco/Crypto/RSAKey.h +++ b/Crypto/include/Poco/Crypto/RSAKey.h @@ -23,8 +23,7 @@ #include "Poco/Crypto/RSAKeyImpl.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class X509Certificate; @@ -129,7 +128,7 @@ inline RSAKeyImpl::Ptr RSAKey::impl() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_RSAKey_INCLUDED diff --git a/Crypto/include/Poco/Crypto/RSAKeyImpl.h b/Crypto/include/Poco/Crypto/RSAKeyImpl.h index 692f432bb2..5c1b5edf83 100644 --- a/Crypto/include/Poco/Crypto/RSAKeyImpl.h +++ b/Crypto/include/Poco/Crypto/RSAKeyImpl.h @@ -35,8 +35,7 @@ typedef struct bignum_st BIGNUM; typedef struct rsa_st RSA; -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class X509Certificate; @@ -135,7 +134,7 @@ inline const RSA* RSAKeyImpl::getRSA() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_RSAKeyImplImpl_INCLUDED diff --git a/Crypto/include/Poco/Crypto/X509Certificate.h b/Crypto/include/Poco/Crypto/X509Certificate.h index 8284dd71dd..91ffb6255e 100644 --- a/Crypto/include/Poco/Crypto/X509Certificate.h +++ b/Crypto/include/Poco/Crypto/X509Certificate.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { class Crypto_API X509Certificate @@ -251,7 +250,7 @@ inline X509* X509Certificate::dup() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto #endif // Crypto_X509Certificate_INCLUDED diff --git a/Crypto/src/Cipher.cpp b/Crypto/src/Cipher.cpp index 2e9326f44d..e1cb786446 100644 --- a/Crypto/src/Cipher.cpp +++ b/Crypto/src/Cipher.cpp @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { Cipher::Cipher() @@ -141,4 +140,4 @@ void Cipher::decrypt(std::istream& source, std::ostream& sink, Encoding encoding } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/CipherFactory.cpp b/Crypto/src/CipherFactory.cpp index 48bf772b52..0a33beacc5 100644 --- a/Crypto/src/CipherFactory.cpp +++ b/Crypto/src/CipherFactory.cpp @@ -27,8 +27,7 @@ #endif -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { CipherFactory::CipherFactory() @@ -70,4 +69,4 @@ Cipher* CipherFactory::createCipher(const EVPPKey& key) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/CipherImpl.cpp b/Crypto/src/CipherImpl.cpp index 40cf626aa4..d9e27a1e39 100644 --- a/Crypto/src/CipherImpl.cpp +++ b/Crypto/src/CipherImpl.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { namespace @@ -215,4 +214,4 @@ CryptoTransform::Ptr CipherImpl::createDecryptor() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/CipherKey.cpp b/Crypto/src/CipherKey.cpp index 41217422bf..af3062e987 100644 --- a/Crypto/src/CipherKey.cpp +++ b/Crypto/src/CipherKey.cpp @@ -15,8 +15,7 @@ #include "Poco/Crypto/CipherKey.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { CipherKey::CipherKey(const std::string& name, @@ -75,4 +74,4 @@ CipherKey& CipherKey::operator = (CipherKey&& other) noexcept } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/CipherKeyImpl.cpp b/Crypto/src/CipherKeyImpl.cpp index f81d49d4fd..86af2afd76 100644 --- a/Crypto/src/CipherKeyImpl.cpp +++ b/Crypto/src/CipherKeyImpl.cpp @@ -40,8 +40,7 @@ namespace } -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { CipherKeyImpl::CipherKeyImpl(const std::string& name, @@ -240,4 +239,4 @@ void CipherKeyImpl::setIV(const ByteVec& iv) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/CryptoException.cpp b/Crypto/src/CryptoException.cpp index e30940d229..c941b463ee 100644 --- a/Crypto/src/CryptoException.cpp +++ b/Crypto/src/CryptoException.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { POCO_IMPLEMENT_EXCEPTION(CryptoException, Exception, "Crypto Exception") @@ -105,4 +104,4 @@ void OpenSSLException::rethrow() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/CryptoStream.cpp b/Crypto/src/CryptoStream.cpp index 6914a7feb1..929f9dd620 100644 --- a/Crypto/src/CryptoStream.cpp +++ b/Crypto/src/CryptoStream.cpp @@ -23,8 +23,7 @@ #undef max -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { // @@ -351,4 +350,4 @@ void DecryptingOutputStream::close() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/CryptoTransform.cpp b/Crypto/src/CryptoTransform.cpp index 6ecba2ec8a..214e031e95 100644 --- a/Crypto/src/CryptoTransform.cpp +++ b/Crypto/src/CryptoTransform.cpp @@ -15,8 +15,7 @@ #include "Poco/Crypto/CryptoTransform.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { CryptoTransform::CryptoTransform() @@ -35,4 +34,4 @@ int CryptoTransform::setPadding(int padding) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/DigestEngine.cpp b/Crypto/src/DigestEngine.cpp index 83e49c3719..5e2db34d69 100644 --- a/Crypto/src/DigestEngine.cpp +++ b/Crypto/src/DigestEngine.cpp @@ -16,8 +16,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { DigestEngine::DigestEngine(const std::string& name): @@ -81,4 +80,4 @@ void DigestEngine::updateImpl(const void* data, std::size_t length) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/ECDSADigestEngine.cpp b/Crypto/src/ECDSADigestEngine.cpp index 7c38e8002d..49fe6afa37 100644 --- a/Crypto/src/ECDSADigestEngine.cpp +++ b/Crypto/src/ECDSADigestEngine.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { // @@ -213,4 +212,4 @@ ECDSASignature::ByteVec ECDSASignature::rawS() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/ECKey.cpp b/Crypto/src/ECKey.cpp index 105a7d3c3d..36a2e9ae24 100644 --- a/Crypto/src/ECKey.cpp +++ b/Crypto/src/ECKey.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { ECKey::ECKey(const EVPPKey& key): @@ -88,4 +87,4 @@ ECKey& ECKey::operator = (ECKey&& other) noexcept } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/ECKeyImpl.cpp b/Crypto/src/ECKeyImpl.cpp index 7662138e27..271bad72ce 100644 --- a/Crypto/src/ECKeyImpl.cpp +++ b/Crypto/src/ECKeyImpl.cpp @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { ECKeyImpl::ECKeyImpl(const EVPPKey& key): @@ -254,4 +253,4 @@ bool ECKeyImpl::hasCurve(const std::string& name) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/EVPCipherImpl.cpp b/Crypto/src/EVPCipherImpl.cpp index afb653f972..a18a242535 100644 --- a/Crypto/src/EVPCipherImpl.cpp +++ b/Crypto/src/EVPCipherImpl.cpp @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { namespace @@ -307,4 +306,4 @@ CryptoTransform::Ptr EVPCipherImpl::createDecryptor() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/EVPPKey.cpp b/Crypto/src/EVPPKey.cpp index 068586dc3e..a0663250f5 100644 --- a/Crypto/src/EVPPKey.cpp +++ b/Crypto/src/EVPPKey.cpp @@ -25,8 +25,7 @@ #include #endif -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { const std::map EVPPKey::KNOWN_TYPES = @@ -607,4 +606,4 @@ int EVPPKey::passCB(char* buf, int size, int, void* pass) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/Envelope.cpp b/Crypto/src/Envelope.cpp index 40c4fe364c..22c19cfd88 100644 --- a/Crypto/src/Envelope.cpp +++ b/Crypto/src/Envelope.cpp @@ -14,8 +14,7 @@ #include "Poco/Crypto/Envelope.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { Envelope::Envelope(int cipherNID): _pCipher(EVP_get_cipherbynid(cipherNID)), @@ -159,4 +158,4 @@ void Envelope::handleErrors(std::string&& msg) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/KeyPair.cpp b/Crypto/src/KeyPair.cpp index 25dc4f9279..a475e73ad7 100644 --- a/Crypto/src/KeyPair.cpp +++ b/Crypto/src/KeyPair.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { KeyPair::KeyPair(KeyPairImpl::Ptr pKeyPairImpl): @@ -60,4 +59,4 @@ KeyPair& KeyPair::operator = (KeyPair&& other) noexcept } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/KeyPairImpl.cpp b/Crypto/src/KeyPairImpl.cpp index c782f04270..1daecb7e44 100644 --- a/Crypto/src/KeyPairImpl.cpp +++ b/Crypto/src/KeyPairImpl.cpp @@ -16,8 +16,7 @@ #include "Poco/Crypto/KeyPairImpl.h" -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { KeyPairImpl::KeyPairImpl(const std::string& name, Type type): @@ -32,4 +31,4 @@ KeyPairImpl::~KeyPairImpl() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/OpenSSLInitializer.cpp b/Crypto/src/OpenSSLInitializer.cpp index 6cf1b05978..0b7e95df7c 100644 --- a/Crypto/src/OpenSSLInitializer.cpp +++ b/Crypto/src/OpenSSLInitializer.cpp @@ -48,8 +48,7 @@ #endif // _MSC_VER && _MT && !POCO_EXTERNAL_OPENSSL && (POCO_MSVS_VERSION < 2013) -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { Poco::AtomicCounter OpenSSLInitializer::_rc; @@ -122,4 +121,4 @@ void uninitializeCrypto() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/PKCS12Container.cpp b/Crypto/src/PKCS12Container.cpp index b1f797b353..ae01bbd52c 100644 --- a/Crypto/src/PKCS12Container.cpp +++ b/Crypto/src/PKCS12Container.cpp @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { PKCS12Container::PKCS12Container(std::istream& istr, const std::string& password) : _pKey(nullptr) @@ -202,4 +201,4 @@ void PKCS12Container::load(PKCS12* pPKCS12, const std::string& password) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/RSACipherImpl.cpp b/Crypto/src/RSACipherImpl.cpp index 704ce17413..656f47e5f3 100644 --- a/Crypto/src/RSACipherImpl.cpp +++ b/Crypto/src/RSACipherImpl.cpp @@ -20,8 +20,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { namespace @@ -338,4 +337,4 @@ CryptoTransform::Ptr RSACipherImpl::createDecryptor() } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/RSADigestEngine.cpp b/Crypto/src/RSADigestEngine.cpp index 4d684ec804..91f1fbf71a 100644 --- a/Crypto/src/RSADigestEngine.cpp +++ b/Crypto/src/RSADigestEngine.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { RSADigestEngine::RSADigestEngine(const RSAKey& key, DigestType digestType): @@ -93,4 +92,4 @@ void RSADigestEngine::updateImpl(const void* data, std::size_t length) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/RSAKey.cpp b/Crypto/src/RSAKey.cpp index ef53be9b23..f23b98d40f 100644 --- a/Crypto/src/RSAKey.cpp +++ b/Crypto/src/RSAKey.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { RSAKey::RSAKey(const EVPPKey& key): @@ -105,4 +104,4 @@ RSAKeyImpl::ByteVec RSAKey::decryptionExponent() const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/RSAKeyImpl.cpp b/Crypto/src/RSAKeyImpl.cpp index cd408b17a8..a932f0d12b 100644 --- a/Crypto/src/RSAKeyImpl.cpp +++ b/Crypto/src/RSAKeyImpl.cpp @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { RSAKeyImpl::RSAKeyImpl(const EVPPKey& key): @@ -361,4 +360,4 @@ RSAKeyImpl::ByteVec RSAKeyImpl::convertToByteVec(const BIGNUM* bn) } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/Crypto/src/X509Certificate.cpp b/Crypto/src/X509Certificate.cpp index 50fb97221a..2fc1731711 100644 --- a/Crypto/src/X509Certificate.cpp +++ b/Crypto/src/X509Certificate.cpp @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Crypto { +namespace Poco::Crypto { X509Certificate::X509Certificate(std::istream& istr) : _pCert(nullptr) @@ -445,4 +444,4 @@ void X509Certificate::print(std::ostream& out) const } -} } // namespace Poco::Crypto +} // namespace Poco::Crypto diff --git a/DNSSD/Avahi/include/Poco/DNSSD/Avahi/Avahi.h b/DNSSD/Avahi/include/Poco/DNSSD/Avahi/Avahi.h index 1b6fe1d9a6..9ef8d52f57 100644 --- a/DNSSD/Avahi/include/Poco/DNSSD/Avahi/Avahi.h +++ b/DNSSD/Avahi/include/Poco/DNSSD/Avahi/Avahi.h @@ -58,8 +58,7 @@ #endif -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { void DNSSD_Avahi_API initializeDNSSD(); @@ -70,7 +69,7 @@ void DNSSD_Avahi_API uninitializeDNSSD(); /// Uninitialize the DNSSD subsystem. -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_Avahi_Avahi_INCLUDED diff --git a/DNSSD/Avahi/include/Poco/DNSSD/Avahi/AvahiBrowserImpl.h b/DNSSD/Avahi/include/Poco/DNSSD/Avahi/AvahiBrowserImpl.h index 266be4ab5e..a5baf7f646 100644 --- a/DNSSD/Avahi/include/Poco/DNSSD/Avahi/AvahiBrowserImpl.h +++ b/DNSSD/Avahi/include/Poco/DNSSD/Avahi/AvahiBrowserImpl.h @@ -26,9 +26,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Avahi { +namespace Poco::DNSSD::Avahi { class AvahiResponderImpl; @@ -80,7 +78,7 @@ class DNSSD_Avahi_API AvahiBrowserImpl: public DNSSDBrowser }; -} } } // namespace Poco::DNSSD::Avahi +} // namespace Poco::DNSSD::Avahi #endif // DNSSD_Avahi_AvahiBrowserImpl_INCLUDED diff --git a/DNSSD/Avahi/include/Poco/DNSSD/Avahi/AvahiResponderImpl.h b/DNSSD/Avahi/include/Poco/DNSSD/Avahi/AvahiResponderImpl.h index b6889e5146..4871194ddd 100644 --- a/DNSSD/Avahi/include/Poco/DNSSD/Avahi/AvahiResponderImpl.h +++ b/DNSSD/Avahi/include/Poco/DNSSD/Avahi/AvahiResponderImpl.h @@ -35,9 +35,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Avahi { +namespace Poco::DNSSD::Avahi { class AvahiBrowserImpl; @@ -128,7 +126,7 @@ class DNSSD_Avahi_API AvahiResponderImplFactory: public Poco::DNSSD::DNSSDRespon }; -} } } // namespace Poco::DNSSD::Avahi +} // namespace Poco::DNSSD::Avahi #endif // DNSSD_Avahi_AvahiResponderImpl_INCLUDED diff --git a/DNSSD/Avahi/src/AvahiBrowserImpl.cpp b/DNSSD/Avahi/src/AvahiBrowserImpl.cpp index e115ab4914..1b3d4f7588 100644 --- a/DNSSD/Avahi/src/AvahiBrowserImpl.cpp +++ b/DNSSD/Avahi/src/AvahiBrowserImpl.cpp @@ -24,9 +24,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Avahi { +namespace Poco::DNSSD::Avahi { extern "C" void onBrowseReply( @@ -593,5 +591,5 @@ void AvahiBrowserImpl::escape(const char* str, std::string& escaped) } -} } } // namespace Poco::DNSSD::Avahi +} // namespace Poco::DNSSD::Avahi diff --git a/DNSSD/Avahi/src/AvahiResponderImpl.cpp b/DNSSD/Avahi/src/AvahiResponderImpl.cpp index cc3f319366..32a3334e79 100644 --- a/DNSSD/Avahi/src/AvahiResponderImpl.cpp +++ b/DNSSD/Avahi/src/AvahiResponderImpl.cpp @@ -22,9 +22,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Avahi { +namespace Poco::DNSSD::Avahi { extern "C" int avahiPollFunc(struct pollfd *ufds, unsigned int nfds, int timeout, void *userdata) @@ -489,11 +487,10 @@ void AvahiResponderImpl::reregisterServices() } -} } } // namespace Poco::DNSSD::Avahi +} // namespace Poco::DNSSD::Avahi -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { namespace @@ -514,5 +511,5 @@ void uninitializeDNSSD() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/Bonjour.h b/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/Bonjour.h index 149c7d9be7..3b1805b631 100644 --- a/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/Bonjour.h +++ b/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/Bonjour.h @@ -58,8 +58,7 @@ #endif -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { void DNSSD_Bonjour_API initializeDNSSD(); @@ -70,7 +69,7 @@ void DNSSD_Bonjour_API uninitializeDNSSD(); /// Uninitialize the DNSSD subsystem. -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_Bonjour_Bonjour_INCLUDED diff --git a/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/BonjourBrowserImpl.h b/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/BonjourBrowserImpl.h index 40879c4853..6a3eee0c8d 100644 --- a/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/BonjourBrowserImpl.h +++ b/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/BonjourBrowserImpl.h @@ -28,9 +28,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Bonjour { +namespace Poco::DNSSD::Bonjour { class EventLoop; @@ -73,7 +71,7 @@ class DNSSD_Bonjour_API BonjourBrowserImpl: public DNSSDBrowser }; -} } } // namespace Poco::DNSSD::Bonjour +} // namespace Poco::DNSSD::Bonjour #endif // DNSSD_Bonjour_BonjourBrowserImpl_INCLUDED diff --git a/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/BonjourResponderImpl.h b/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/BonjourResponderImpl.h index 7c22a4e302..058680096d 100644 --- a/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/BonjourResponderImpl.h +++ b/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/BonjourResponderImpl.h @@ -28,9 +28,7 @@ #include "Poco/Thread.h" -namespace Poco { -namespace DNSSD { -namespace Bonjour { +namespace Poco::DNSSD::Bonjour { class DNSSD_Bonjour_API BonjourResponderImpl: public Poco::DNSSD::DNSSDResponderImpl @@ -82,7 +80,7 @@ class DNSSD_Bonjour_API BonjourResponderImplFactory: public Poco::DNSSD::DNSSDRe }; -} } } // namespace Poco::DNSSD::Bonjour +} // namespace Poco::DNSSD::Bonjour #endif // DNSSD_Bonjour_BonjourResponderImpl_INCLUDED diff --git a/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/EventLoop.h b/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/EventLoop.h index 3080db6f24..11525f2c6b 100644 --- a/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/EventLoop.h +++ b/DNSSD/Bonjour/include/Poco/DNSSD/Bonjour/EventLoop.h @@ -30,9 +30,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Bonjour { +namespace Poco::DNSSD::Bonjour { class DNSSD_Bonjour_API EventLoop: public Poco::Runnable @@ -114,7 +112,7 @@ inline void EventLoop::unlock() } -} } } // namespace Poco::DNSSD::Bonjour +} // namespace Poco::DNSSD::Bonjour #endif // DNSSD_Bonjour_EventLoop_INCLUDED diff --git a/DNSSD/Bonjour/src/BonjourBrowserImpl.cpp b/DNSSD/Bonjour/src/BonjourBrowserImpl.cpp index 76290ada30..c46f8a7a76 100644 --- a/DNSSD/Bonjour/src/BonjourBrowserImpl.cpp +++ b/DNSSD/Bonjour/src/BonjourBrowserImpl.cpp @@ -22,9 +22,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Bonjour { +namespace Poco::DNSSD::Bonjour { extern "C" void DNSSD_API onBrowseReply( @@ -483,4 +481,4 @@ void BonjourBrowserImpl::parseTXTRecord(Poco::UInt16 length, const void* data, S } -} } } // namespace Poco::DNSSD::Bonjour +} // namespace Poco::DNSSD::Bonjour diff --git a/DNSSD/Bonjour/src/BonjourResponderImpl.cpp b/DNSSD/Bonjour/src/BonjourResponderImpl.cpp index e3d260ca86..fe18e59369 100644 --- a/DNSSD/Bonjour/src/BonjourResponderImpl.cpp +++ b/DNSSD/Bonjour/src/BonjourResponderImpl.cpp @@ -21,9 +21,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Bonjour { +namespace Poco::DNSSD::Bonjour { extern "C" void DNSSD_API onRegisterServiceReply( @@ -321,11 +319,10 @@ void BonjourResponderImpl::onRegisterServiceReply( } -} } } // namespace Poco::DNSSD::Bonjour +} // namespace Poco::DNSSD::Bonjour -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { namespace @@ -346,4 +343,4 @@ void uninitializeDNSSD() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/Bonjour/src/EventLoop.cpp b/DNSSD/Bonjour/src/EventLoop.cpp index aa8a3486d9..c43530aab0 100644 --- a/DNSSD/Bonjour/src/EventLoop.cpp +++ b/DNSSD/Bonjour/src/EventLoop.cpp @@ -21,9 +21,7 @@ #include -namespace Poco { -namespace DNSSD { -namespace Bonjour { +namespace Poco::DNSSD::Bonjour { EventLoop::EventLoop(): @@ -146,4 +144,4 @@ void EventLoop::run() } -} } } // namespace Poco::DNSSD::Bonjour +} // namespace Poco::DNSSD::Bonjour diff --git a/DNSSD/include/Poco/DNSSD/DNSSD.h b/DNSSD/include/Poco/DNSSD/DNSSD.h index 3d352373a5..7ca0f9376b 100644 --- a/DNSSD/include/Poco/DNSSD/DNSSD.h +++ b/DNSSD/include/Poco/DNSSD/DNSSD.h @@ -77,8 +77,7 @@ #endif -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { enum HandleType @@ -188,7 +187,7 @@ typedef OpaqueHandle RecordHandle; typedef OpaqueHandle BrowseHandle; -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_DNSSD_INCLUDED diff --git a/DNSSD/include/Poco/DNSSD/DNSSDBrowser.h b/DNSSD/include/Poco/DNSSD/DNSSDBrowser.h index deaa424197..f623be5e8f 100644 --- a/DNSSD/include/Poco/DNSSD/DNSSDBrowser.h +++ b/DNSSD/include/Poco/DNSSD/DNSSDBrowser.h @@ -29,8 +29,7 @@ #include "Poco/BasicEvent.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { class DNSSD_API DNSSDBrowser @@ -340,7 +339,7 @@ class DNSSD_API DNSSDBrowser }; -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_DNSSDBrowser_INCLUDED diff --git a/DNSSD/include/Poco/DNSSD/DNSSDException.h b/DNSSD/include/Poco/DNSSD/DNSSDException.h index e659c9239f..6aafc70aa5 100644 --- a/DNSSD/include/Poco/DNSSD/DNSSDException.h +++ b/DNSSD/include/Poco/DNSSD/DNSSDException.h @@ -24,14 +24,13 @@ #include "Poco/Exception.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { POCO_DECLARE_EXCEPTION(DNSSD_API, DNSSDException, Poco::RuntimeException) -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_DNSSDException_INCLUDED diff --git a/DNSSD/include/Poco/DNSSD/DNSSDResponder.h b/DNSSD/include/Poco/DNSSD/DNSSDResponder.h index 1c25023c1d..81e734cae9 100644 --- a/DNSSD/include/Poco/DNSSD/DNSSDResponder.h +++ b/DNSSD/include/Poco/DNSSD/DNSSDResponder.h @@ -27,8 +27,7 @@ #include "Poco/BasicEvent.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { class DNSSDBrowser; @@ -187,7 +186,7 @@ class DNSSD_API DNSSDResponder }; -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_DNSSDResponder_INCLUDED diff --git a/DNSSD/include/Poco/DNSSD/DNSSDResponderImpl.h b/DNSSD/include/Poco/DNSSD/DNSSDResponderImpl.h index 982f2cd7f8..c896a56f71 100644 --- a/DNSSD/include/Poco/DNSSD/DNSSDResponderImpl.h +++ b/DNSSD/include/Poco/DNSSD/DNSSDResponderImpl.h @@ -23,8 +23,7 @@ #include "Poco/DNSSD/DNSSD.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { class DNSSDBrowser; @@ -113,7 +112,7 @@ class DNSSD_API DNSSDResponderImplFactory }; -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_DNSSDResponderImpl_INCLUDED diff --git a/DNSSD/include/Poco/DNSSD/Domain.h b/DNSSD/include/Poco/DNSSD/Domain.h index 5087c290d8..38df15b044 100644 --- a/DNSSD/include/Poco/DNSSD/Domain.h +++ b/DNSSD/include/Poco/DNSSD/Domain.h @@ -23,8 +23,7 @@ #include "Poco/DNSSD/DNSSD.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { class DNSSD_API Domain @@ -81,7 +80,7 @@ inline bool Domain::isDefault() const } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_Domain_INCLUDED diff --git a/DNSSD/include/Poco/DNSSD/Error.h b/DNSSD/include/Poco/DNSSD/Error.h index 0033877bef..75890043e0 100644 --- a/DNSSD/include/Poco/DNSSD/Error.h +++ b/DNSSD/include/Poco/DNSSD/Error.h @@ -23,8 +23,7 @@ #include "Poco/DNSSD/DNSSD.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { class DNSSD_API Error @@ -83,7 +82,7 @@ inline const std::string& Error::message() const } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_Error_INCLUDED diff --git a/DNSSD/include/Poco/DNSSD/Record.h b/DNSSD/include/Poco/DNSSD/Record.h index ede194c5e2..413c36e939 100644 --- a/DNSSD/include/Poco/DNSSD/Record.h +++ b/DNSSD/include/Poco/DNSSD/Record.h @@ -23,8 +23,7 @@ #include "Poco/DNSSD/DNSSD.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { class DNSSD_API Record @@ -217,7 +216,7 @@ inline Poco::UInt32 Record::ttl() const } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_Service_INCLUDED diff --git a/DNSSD/include/Poco/DNSSD/Service.h b/DNSSD/include/Poco/DNSSD/Service.h index 61435348b7..cdaf2f740f 100644 --- a/DNSSD/include/Poco/DNSSD/Service.h +++ b/DNSSD/include/Poco/DNSSD/Service.h @@ -24,8 +24,7 @@ #include "Poco/Net/NameValueCollection.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { class DNSSD_API Service @@ -241,7 +240,7 @@ inline Service::Properties& Service::properties() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD #endif // DNSSD_Service_INCLUDED diff --git a/DNSSD/src/DNSSDBrowser.cpp b/DNSSD/src/DNSSDBrowser.cpp index 33d623e4ae..285ef6e86a 100644 --- a/DNSSD/src/DNSSDBrowser.cpp +++ b/DNSSD/src/DNSSDBrowser.cpp @@ -17,8 +17,7 @@ #include "Poco/DNSSD/DNSSDBrowser.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { DNSSDBrowser::DNSSDBrowser() @@ -31,4 +30,4 @@ DNSSDBrowser::~DNSSDBrowser() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/src/DNSSDException.cpp b/DNSSD/src/DNSSDException.cpp index dcd71cfbd2..b07f981ece 100644 --- a/DNSSD/src/DNSSDException.cpp +++ b/DNSSD/src/DNSSDException.cpp @@ -18,11 +18,10 @@ #include -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { POCO_IMPLEMENT_EXCEPTION(DNSSDException, Poco::RuntimeException, "DNSSD Exception") -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/src/DNSSDResponder.cpp b/DNSSD/src/DNSSDResponder.cpp index 4c5aadca85..309cf9ee39 100644 --- a/DNSSD/src/DNSSDResponder.cpp +++ b/DNSSD/src/DNSSDResponder.cpp @@ -19,8 +19,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { DNSSDResponderImplFactory* DNSSDResponder::_pImplFactory(nullptr); @@ -106,4 +105,4 @@ void DNSSDResponder::unregisterImplFactory() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/src/DNSSDResponderImpl.cpp b/DNSSD/src/DNSSDResponderImpl.cpp index 26a765c455..cc7b40787f 100644 --- a/DNSSD/src/DNSSDResponderImpl.cpp +++ b/DNSSD/src/DNSSDResponderImpl.cpp @@ -17,8 +17,7 @@ #include "Poco/DNSSD/DNSSDResponderImpl.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { DNSSDResponderImpl::DNSSDResponderImpl() @@ -36,4 +35,4 @@ DNSSDResponderImplFactory::~DNSSDResponderImplFactory() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/src/Domain.cpp b/DNSSD/src/Domain.cpp index 41b530df67..9226479367 100644 --- a/DNSSD/src/Domain.cpp +++ b/DNSSD/src/Domain.cpp @@ -17,8 +17,7 @@ #include "Poco/DNSSD/Domain.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { Domain::Domain(): @@ -41,4 +40,4 @@ Domain::~Domain() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/src/Error.cpp b/DNSSD/src/Error.cpp index a56d73b235..62447006ce 100644 --- a/DNSSD/src/Error.cpp +++ b/DNSSD/src/Error.cpp @@ -17,8 +17,7 @@ #include "Poco/DNSSD/Error.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { Error::Error(): @@ -41,4 +40,4 @@ Error::~Error() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/src/Record.cpp b/DNSSD/src/Record.cpp index c4432bf4b2..c89f39217f 100644 --- a/DNSSD/src/Record.cpp +++ b/DNSSD/src/Record.cpp @@ -17,8 +17,7 @@ #include "Poco/DNSSD/Record.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { Record::Record(): @@ -61,4 +60,4 @@ Record::~Record() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/DNSSD/src/Service.cpp b/DNSSD/src/Service.cpp index 5b56655a73..843a7d6292 100644 --- a/DNSSD/src/Service.cpp +++ b/DNSSD/src/Service.cpp @@ -17,8 +17,7 @@ #include "Poco/DNSSD/Service.h" -namespace Poco { -namespace DNSSD { +namespace Poco::DNSSD { Service::Service(): @@ -77,4 +76,4 @@ Service::~Service() } -} } // namespace Poco::DNSSD +} // namespace Poco::DNSSD diff --git a/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h b/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h index c1a5f024e2..2a4fe570e0 100644 --- a/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h +++ b/Data/DataTest/include/Poco/Data/Test/SQLExecutor.h @@ -28,9 +28,7 @@ using namespace Poco::Data::Keywords; -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { #define poco_data_using_keywords using Poco::Data::Keywords::now; \ @@ -396,7 +394,7 @@ class DataTest_API SQLExecutor: public CppUnit::TestCase }; -} } } // Poco::Data::Test +} // namespace Poco::Data::Test #endif // DataTest_SQLExecutor_INCLUDED diff --git a/Data/DataTest/src/SQLExecutor.cpp b/Data/DataTest/src/SQLExecutor.cpp index 8178587c24..2d02ec316a 100644 --- a/Data/DataTest/src/SQLExecutor.cpp +++ b/Data/DataTest/src/SQLExecutor.cpp @@ -169,8 +169,7 @@ struct RefCountedPerson : public Poco::RefCountedObject } // namespace -namespace Poco { -namespace Data { +namespace Poco::Data { template <> @@ -4769,4 +4768,4 @@ std::string SQLExecutor::formatSQL(const std::string& s) const } -} } } // Poco::Data::Test +} } // namespace Poco::Data diff --git a/Data/MySQL/include/Poco/Data/MySQL/Binder.h b/Data/MySQL/include/Poco/Data/MySQL/Binder.h index 4f4aab1408..339d45e8d8 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Binder.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Binder.h @@ -25,9 +25,7 @@ #include -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class MySQL_API Binder: public Poco::Data::AbstractBinder @@ -252,7 +250,7 @@ class MySQL_API Binder: public Poco::Data::AbstractBinder }; -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif // Data_MySQL_Binder_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/Connector.h b/Data/MySQL/include/Poco/Data/MySQL/Connector.h index 413f65c130..02479852e9 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Connector.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Connector.h @@ -22,9 +22,7 @@ #include "Poco/Data/Connector.h" -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class MySQL_API Connector: public Poco::Data::Connector @@ -54,7 +52,7 @@ class MySQL_API Connector: public Poco::Data::Connector }; -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif // Data_MySQL_Connector_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h index fdd279b2ad..820be0df14 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Extractor.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Extractor.h @@ -27,14 +27,12 @@ #include "Poco/Nullable.h" -namespace Poco { - -namespace Dynamic { +namespace Poco::Dynamic { class Var; -} +} // namespace Poco::Dynamic + -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class MySQL_API Extractor: public Poco::Data::AbstractExtractor @@ -430,7 +428,7 @@ class MySQL_API Extractor: public Poco::Data::AbstractExtractor }; -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif // Data_MySQL_Extractor_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h index 67692df3a9..93f0a1669a 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h +++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h @@ -25,9 +25,7 @@ #include -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { // End-user include this file and use in code ConnectionException/StatementException @@ -148,7 +146,7 @@ inline void MySQLException::rethrow() const } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif //Data_MySQL_MySQLException_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h index 99a011972d..91d028da9b 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h +++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLStatementImpl.h @@ -29,9 +29,7 @@ #include "Poco/Format.h" -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class MySQL_API MySQLStatementImpl: public Poco::Data::StatementImpl @@ -96,7 +94,7 @@ class MySQL_API MySQLStatementImpl: public Poco::Data::StatementImpl }; -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif // Data_MySQL_MySQLStatementImpl_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h index 8b45e2a3bb..dd16585416 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h +++ b/Data/MySQL/include/Poco/Data/MySQL/ResultMetadata.h @@ -31,9 +31,7 @@ typedef my_bool my_boolv; #endif -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class ResultMetadata @@ -81,7 +79,7 @@ class ResultMetadata }; -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif //Data_MySQL_ResultMetadata_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h index e066f23971..7659f420af 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h +++ b/Data/MySQL/include/Poco/Data/MySQL/SessionHandle.h @@ -22,9 +22,7 @@ #include -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class SessionHandle @@ -97,7 +95,7 @@ inline SessionHandle::operator MYSQL* () } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif // Data_MySQL_SessionHandle_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h index 20791d1b5c..1b9b468608 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h +++ b/Data/MySQL/include/Poco/Data/MySQL/SessionImpl.h @@ -27,9 +27,7 @@ #include "Poco/Mutex.h" -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class MySQL_API SessionImpl: public Poco::Data::AbstractSessionImpl @@ -290,7 +288,7 @@ inline std::string& SessionImpl::getValue(MYSQL_BIND* pResult, std::string& val) } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif // Data_MySQL_SessionImpl_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h index 9ada02d429..bca1bf5f71 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h +++ b/Data/MySQL/include/Poco/Data/MySQL/StatementExecutor.h @@ -22,9 +22,7 @@ #include -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class StatementExecutor @@ -93,7 +91,7 @@ inline StatementExecutor::operator MYSQL_STMT* () } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif // Data_MySQL_StatementHandle_INCLUDED diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h index d6d9b4075b..44e0c20c19 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Utility.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Utility.h @@ -23,9 +23,7 @@ #include -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { class MySQL_API Utility @@ -66,7 +64,7 @@ inline MYSQL* Utility::handle(Session& session) } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL #endif // MySQL_Utility_INCLUDED diff --git a/Data/MySQL/src/Binder.cpp b/Data/MySQL/src/Binder.cpp index 81bcd364ea..e9fee6d040 100644 --- a/Data/MySQL/src/Binder.cpp +++ b/Data/MySQL/src/Binder.cpp @@ -15,9 +15,7 @@ #include "Poco/Data/MySQL/Binder.h" -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { Binder::Binder() @@ -639,4 +637,4 @@ void Binder::bind(std::size_t pos, const std::list& val, Direction } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/Connector.cpp b/Data/MySQL/src/Connector.cpp index 286a8d705a..cf1b5bb987 100644 --- a/Data/MySQL/src/Connector.cpp +++ b/Data/MySQL/src/Connector.cpp @@ -19,9 +19,7 @@ #include -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { std::string Connector::KEY("mysql"); @@ -68,5 +66,5 @@ void Connector::unregisterConnector() } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/Extractor.cpp b/Data/MySQL/src/Extractor.cpp index b30fdd19a7..2ba73d2522 100644 --- a/Data/MySQL/src/Extractor.cpp +++ b/Data/MySQL/src/Extractor.cpp @@ -17,9 +17,7 @@ #include "Poco/Data/Time.h" -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { Extractor::Extractor(StatementExecutor& st, ResultMetadata& md): _stmt(st), _metadata(md) @@ -865,4 +863,4 @@ bool Extractor::extract(std::size_t , std::list& ) } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/MySQLException.cpp b/Data/MySQL/src/MySQLException.cpp index c5af6d0095..42c8ccabc0 100644 --- a/Data/MySQL/src/MySQLException.cpp +++ b/Data/MySQL/src/MySQLException.cpp @@ -21,9 +21,7 @@ #include "Poco/NumberFormatter.h" -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { MySQLException::MySQLException(const std::string& msg) : Poco::Data::DataException(std::string("[MySQL]: ") + msg) @@ -138,4 +136,4 @@ std::string StatementException::compose(const std::string& text, MYSQL_STMT* h, } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/MySQLStatementImpl.cpp b/Data/MySQL/src/MySQLStatementImpl.cpp index 68f0495672..946478278c 100644 --- a/Data/MySQL/src/MySQLStatementImpl.cpp +++ b/Data/MySQL/src/MySQLStatementImpl.cpp @@ -15,9 +15,7 @@ #include "Poco/Data/MySQL/MySQLStatementImpl.h" -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { MySQLStatementImpl::MySQLStatementImpl(SessionImpl& h) : @@ -172,4 +170,4 @@ Poco::Data::AbstractBinder::Ptr MySQLStatementImpl::binder() } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/ResultMetadata.cpp b/Data/MySQL/src/ResultMetadata.cpp index 744a78b1bf..8f2179cb80 100644 --- a/Data/MySQL/src/ResultMetadata.cpp +++ b/Data/MySQL/src/ResultMetadata.cpp @@ -144,9 +144,7 @@ namespace } // namespace -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { ResultMetadata::~ResultMetadata() @@ -273,4 +271,4 @@ void ResultMetadata::adjustColumnSizeToFit(std::size_t pos) } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/SessionHandle.cpp b/Data/MySQL/src/SessionHandle.cpp index e327c375ba..001f78cc2e 100644 --- a/Data/MySQL/src/SessionHandle.cpp +++ b/Data/MySQL/src/SessionHandle.cpp @@ -27,9 +27,7 @@ typedef bool my_bool; // Workaround to make library work with MySQL client 8.0 a #define POCO_MYSQL_VERSION_NUMBER ((NDB_VERSION_MAJOR<<16) | (NDB_VERSION_MINOR<<8) | (NDB_VERSION_BUILD&0xFF)) -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { #ifdef POCO_OS_FAMILY_UNIX @@ -204,4 +202,4 @@ bool SessionHandle::ping() } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/SessionImpl.cpp b/Data/MySQL/src/SessionImpl.cpp index 64802320bc..2751985d79 100644 --- a/Data/MySQL/src/SessionImpl.cpp +++ b/Data/MySQL/src/SessionImpl.cpp @@ -34,9 +34,7 @@ namespace } -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { const std::string SessionImpl::MYSQL_READ_UNCOMMITTED = "READ UNCOMMITTED"; @@ -382,4 +380,4 @@ void SessionImpl::setConnectionTimeout(std::size_t timeout) } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/StatementExecutor.cpp b/Data/MySQL/src/StatementExecutor.cpp index 954e615742..0c7cc36b78 100644 --- a/Data/MySQL/src/StatementExecutor.cpp +++ b/Data/MySQL/src/StatementExecutor.cpp @@ -17,9 +17,7 @@ #include -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { StatementExecutor::StatementExecutor(MYSQL* mysql) @@ -151,4 +149,4 @@ int StatementExecutor::getAffectedRowCount() const } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/src/Utility.cpp b/Data/MySQL/src/Utility.cpp index 84e5cfca7b..2a34f008c7 100644 --- a/Data/MySQL/src/Utility.cpp +++ b/Data/MySQL/src/Utility.cpp @@ -18,9 +18,7 @@ #include -namespace Poco { -namespace Data { -namespace MySQL { +namespace Poco::Data::MySQL { std::string Utility::serverInfo(MYSQL* pHandle) @@ -63,4 +61,4 @@ std::string Utility::hostInfo(Session& session) } -} } } // namespace Poco::Data::MySQL +} // namespace Poco::Data::MySQL diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 57f9ee3330..a2651db54e 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -86,8 +86,7 @@ struct Person }; -namespace Poco { -namespace Data { +namespace Poco::Data { template <> @@ -140,7 +139,7 @@ class TypeHandler }; -} } // namespace Poco::Data +} // namespace Poco::Data SQLExecutor::SQLExecutor(const std::string& name, Poco::Data::Session* pSession): diff --git a/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h b/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h index 83805fa340..0b34423e77 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h +++ b/Data/ODBC/include/Poco/Data/ODBC/ConnectionHandle.h @@ -27,9 +27,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class SessionImpl; @@ -196,7 +194,7 @@ inline int ConnectionHandle::getLoginTimeout() const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/Connector.h b/Data/ODBC/include/Poco/Data/ODBC/Connector.h index 2009675f49..e4c17881d6 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Connector.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Connector.h @@ -22,9 +22,7 @@ #include "Poco/Data/Connector.h" -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ODBC_API Connector: public Poco::Data::Connector @@ -90,7 +88,7 @@ inline bool Connector::stringBoundToLongVarChar() } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif // Data_ODBC_Connector_INCLUDED diff --git a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h index 0f65ac6ecf..c7d519b406 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Diagnostics.h @@ -28,9 +28,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { template @@ -266,7 +264,7 @@ using StatementDiagnostics = Diagnostics; using DescriptorDiagnostics = Diagnostics; -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h b/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h index eb279fe8fc..317098b6c3 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h +++ b/Data/ODBC/include/Poco/Data/ODBC/EnvironmentHandle.h @@ -25,9 +25,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ODBC_API EnvironmentHandle @@ -87,7 +85,7 @@ inline SQLHENV& EnvironmentHandle::handle() } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/Error.h b/Data/ODBC/include/Poco/Data/ODBC/Error.h index b1aeb22f18..6212d0c0e1 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Error.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Error.h @@ -28,9 +28,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { template @@ -146,7 +144,7 @@ using StatementError = Error; using DescriptorError = Error; -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h index f9809870f9..9519c4794c 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Extractor.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Extractor.h @@ -40,9 +40,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ODBC_API Extractor: public Poco::Data::AbstractExtractor @@ -857,7 +855,7 @@ inline SQLINTEGER Extractor::columnSize(std::size_t pos) const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif // Data_ODBC_Extractor_INCLUDED diff --git a/Data/ODBC/include/Poco/Data/ODBC/Handle.h b/Data/ODBC/include/Poco/Data/ODBC/Handle.h index c9c4bff48a..e521b28550 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Handle.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Handle.h @@ -28,9 +28,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { template @@ -113,7 +111,7 @@ typedef Handle StatementHandle; typedef Handle DescriptorHandle; -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h index 5daf67cedd..f714eb93bd 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h +++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCException.h @@ -25,9 +25,7 @@ #include "Poco/Format.h" -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { POCO_DECLARE_EXCEPTION(ODBC_API, ODBCException, Poco::Data::DataException) @@ -161,7 +159,7 @@ using StatementException = HandleException; using DescriptorException = HandleException; -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h index dddf197911..31276a6b9f 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h +++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCMetaColumn.h @@ -27,9 +27,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ODBC_API ODBCMetaColumn: public MetaColumn @@ -84,7 +82,7 @@ inline std::size_t ODBCMetaColumn::dataLength() const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h index 7330f8f9ee..33a07b6d73 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h +++ b/Data/ODBC/include/Poco/Data/ODBC/ODBCStatementImpl.h @@ -34,9 +34,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ODBC_API ODBCStatementImpl: public Poco::Data::StatementImpl @@ -212,7 +210,7 @@ inline bool ODBCStatementImpl::canCompile() const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif // Data_ODBC_ODBCStatementImpl_INCLUDED diff --git a/Data/ODBC/include/Poco/Data/ODBC/Parameter.h b/Data/ODBC/include/Poco/Data/ODBC/Parameter.h index 67ae6635b8..441f071b03 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Parameter.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Parameter.h @@ -26,9 +26,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ODBC_API Parameter @@ -105,7 +103,7 @@ inline bool Parameter::isNullable() const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h index 6e02f8b1c7..89f3302974 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Preparator.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Preparator.h @@ -38,8 +38,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Date; @@ -1281,7 +1280,7 @@ inline Poco::Any& Preparator::at(std::size_t pos) } -} } } // namespace Poco::Data::ODBC +} } // namespace Poco::Data #endif // Data_ODBC_Preparator_INCLUDED diff --git a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h index 1a97f21475..774bb69f72 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h +++ b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h @@ -31,9 +31,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ODBC_API SessionImpl: public Poco::Data::AbstractSessionImpl @@ -341,7 +339,7 @@ inline const std::string& SessionImpl::dbEncoding() const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif // Data_ODBC_SessionImpl_INCLUDED diff --git a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h index 4899f97d3f..4df944daf9 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h +++ b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h @@ -29,9 +29,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ODBC_API TypeInfo @@ -214,7 +212,7 @@ class ODBC_API TypeInfo }; -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode.h index 95924c4c0d..b3551bc973 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Unicode.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode.h @@ -44,9 +44,7 @@ #endif -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { #if defined(POCO_PTR_IS_64_BIT) || defined(POCO_OS_FAMILY_UNIX) // mkrivos - POCO_OS_FAMILY_UNIX doesn't compile with SQLPOINTER & SQLColAttribute() @@ -977,7 +975,7 @@ inline SQLRETURN SQLDrivers(SQLHENV henv, #endif // POCO_ODBC_UNICODE -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif // ODBC_Unicode_INCLUDED diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h index a686246a41..426619d291 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_UNIXODBC.h @@ -21,9 +21,7 @@ #include #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::string& target); @@ -48,7 +46,7 @@ inline void makeUTF8(Poco::Buffer& buffer, int length, SQLPOINTER pTar } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif // Data_ODBC_Unicode_UNIX_INCLUDED diff --git a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h index c18c591474..f72993b9ee 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Unicode_WIN32.h @@ -23,9 +23,7 @@ #include #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { inline void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::wstring& target) @@ -63,7 +61,7 @@ inline void makeUTF8(Poco::Buffer& buffer, SQLINTEGER length, SQLPOINTE } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif // Data_ODBC_Unicode_WIN32_INCLUDED diff --git a/Data/ODBC/include/Poco/Data/ODBC/Utility.h b/Data/ODBC/include/Poco/Data/ODBC/Utility.h index 7d24b0eb8d..d8490cb33d 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Utility.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Utility.h @@ -27,9 +27,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { class ConnectionHandle; @@ -249,7 +247,7 @@ inline void Utility::timeSync(Time& t, const SQL_TIME_STRUCT& ts) } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC #endif diff --git a/Data/ODBC/src/Binder.cpp b/Data/ODBC/src/Binder.cpp index f5a2c5b9d5..a8e7c6adff 100644 --- a/Data/ODBC/src/Binder.cpp +++ b/Data/ODBC/src/Binder.cpp @@ -23,9 +23,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { Binder::Binder(const StatementHandle& rStmt, @@ -673,4 +671,4 @@ void Binder::setParamSetSize(std::size_t length) } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/ConnectionHandle.cpp b/Data/ODBC/src/ConnectionHandle.cpp index 958d769216..56adad4112 100644 --- a/Data/ODBC/src/ConnectionHandle.cpp +++ b/Data/ODBC/src/ConnectionHandle.cpp @@ -17,9 +17,7 @@ #include "Poco/Data/ODBC/ODBCException.h" -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { const std::string ConnectionHandle::UNSUPPORTED_SQLSTATE = "HYC00"; @@ -273,4 +271,4 @@ bool ConnectionHandle::isConnected() const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Connector.cpp b/Data/ODBC/src/Connector.cpp index 64c491d2ad..e17474714d 100644 --- a/Data/ODBC/src/Connector.cpp +++ b/Data/ODBC/src/Connector.cpp @@ -24,9 +24,7 @@ #endif -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { const std::string Connector::KEY("ODBC"); @@ -68,4 +66,4 @@ void Connector::bindStringToLongVarChar(bool flag) } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Diagnostics.cpp b/Data/ODBC/src/Diagnostics.cpp index 8eefefc0e7..e34cf7448a 100644 --- a/Data/ODBC/src/Diagnostics.cpp +++ b/Data/ODBC/src/Diagnostics.cpp @@ -15,9 +15,7 @@ #include "Poco/Data/ODBC/Diagnostics.h" -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { // explicit instantiation definition #ifndef POCO_DOC @@ -37,4 +35,4 @@ template class Diagnostics; #endif -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/EnvironmentHandle.cpp b/Data/ODBC/src/EnvironmentHandle.cpp index d4a26461c9..34eec7d701 100644 --- a/Data/ODBC/src/EnvironmentHandle.cpp +++ b/Data/ODBC/src/EnvironmentHandle.cpp @@ -19,9 +19,7 @@ #include "Poco/Debugger.h" -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { EnvironmentHandle::EnvironmentHandle(): _henv(POCO_ODBC_NULL_HENV) @@ -61,4 +59,4 @@ EnvironmentHandle::~EnvironmentHandle() } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Error.cpp b/Data/ODBC/src/Error.cpp index a0a8bdf478..d6acd56756 100644 --- a/Data/ODBC/src/Error.cpp +++ b/Data/ODBC/src/Error.cpp @@ -15,9 +15,7 @@ #include "Poco/Data/ODBC/Error.h" -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { // explicit instantiation definition #ifndef POCO_DOC @@ -37,4 +35,4 @@ template class Error; #endif -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Extractor.cpp b/Data/ODBC/src/Extractor.cpp index 905491af4b..da3a30294e 100644 --- a/Data/ODBC/src/Extractor.cpp +++ b/Data/ODBC/src/Extractor.cpp @@ -23,9 +23,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { const std::string Extractor::FLD_SIZE_EXCEEDED_FMT = "Specified data size (%z bytes) " @@ -1575,4 +1573,4 @@ void Extractor::checkDataSize(std::size_t size) } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/ODBCException.cpp b/Data/ODBC/src/ODBCException.cpp index 363c418ade..f4a97e67d6 100644 --- a/Data/ODBC/src/ODBCException.cpp +++ b/Data/ODBC/src/ODBCException.cpp @@ -16,9 +16,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { #if defined(POCO_OS_FAMILY_WINDOWS) && defined(ODBC_EXPORTS) template class ODBC_API HandleException; @@ -38,4 +36,4 @@ POCO_IMPLEMENT_EXCEPTION(UnknownDataLengthException, ODBCException, "Unknown len POCO_IMPLEMENT_EXCEPTION(DataTruncatedException, ODBCException, "Variable length character or binary data truncated") -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/ODBCMetaColumn.cpp b/Data/ODBC/src/ODBCMetaColumn.cpp index 03bd86b149..69f11bf625 100644 --- a/Data/ODBC/src/ODBCMetaColumn.cpp +++ b/Data/ODBC/src/ODBCMetaColumn.cpp @@ -16,9 +16,7 @@ #include "Poco/Data/ODBC/Utility.h" -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { ODBCMetaColumn::ODBCMetaColumn(const StatementHandle& rStmt, std::size_t position) : @@ -161,4 +159,4 @@ void ODBCMetaColumn::init() } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/ODBCStatementImpl.cpp b/Data/ODBC/src/ODBCStatementImpl.cpp index 5d0991428b..0e667cd1f9 100644 --- a/Data/ODBC/src/ODBCStatementImpl.cpp +++ b/Data/ODBC/src/ODBCStatementImpl.cpp @@ -28,9 +28,7 @@ using Poco::DataFormatException; -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { const std::string ODBCStatementImpl::INVALID_CURSOR_STATE = "24000"; @@ -527,4 +525,4 @@ int ODBCStatementImpl::affectedRowCount() const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Parameter.cpp b/Data/ODBC/src/Parameter.cpp index 00f8a01661..d98b242fda 100644 --- a/Data/ODBC/src/Parameter.cpp +++ b/Data/ODBC/src/Parameter.cpp @@ -18,9 +18,7 @@ #include "Poco/Data/ODBC/ODBCException.h" -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { Parameter::Parameter(const StatementHandle& rStmt, std::size_t colNum) : @@ -50,4 +48,4 @@ void Parameter::init() } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Preparator.cpp b/Data/ODBC/src/Preparator.cpp index 8564efd537..8e6358c381 100644 --- a/Data/ODBC/src/Preparator.cpp +++ b/Data/ODBC/src/Preparator.cpp @@ -20,9 +20,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { Preparator::Preparator(const StatementHandle& rStmt, @@ -208,4 +206,4 @@ void Preparator::prepareBoolArray(std::size_t pos, SQLSMALLINT valueType, std::s } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/SessionImpl.cpp b/Data/ODBC/src/SessionImpl.cpp index a5c47d8595..442daf4a5f 100644 --- a/Data/ODBC/src/SessionImpl.cpp +++ b/Data/ODBC/src/SessionImpl.cpp @@ -21,9 +21,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { SessionImpl::SessionImpl(const std::string& connect, @@ -516,4 +514,4 @@ int SessionImpl::maxStatementLength() const } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/TypeInfo.cpp b/Data/ODBC/src/TypeInfo.cpp index c3141f7f50..8ad6325231 100644 --- a/Data/ODBC/src/TypeInfo.cpp +++ b/Data/ODBC/src/TypeInfo.cpp @@ -18,9 +18,7 @@ #include "Poco/Exception.h" #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { TypeInfo::TypeInfo(SQLHDBC* pHDBC): _pHDBC(pHDBC) @@ -270,4 +268,4 @@ void TypeInfo::print(std::ostream& ostr) } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Unicode_UNIXODBC.cpp b/Data/ODBC/src/Unicode_UNIXODBC.cpp index 628ca938ae..83f9ac15c1 100644 --- a/Data/ODBC/src/Unicode_UNIXODBC.cpp +++ b/Data/ODBC/src/Unicode_UNIXODBC.cpp @@ -32,9 +32,7 @@ using Poco::InvalidArgumentException; using Poco::NotImplementedException; -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { void makeUTF16(SQLCHAR* pSQLChar, SQLINTEGER length, std::string& target) @@ -850,4 +848,4 @@ SQLRETURN SQLDrivers(SQLHENV henv, } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Unicode_WIN32.cpp b/Data/ODBC/src/Unicode_WIN32.cpp index cbc57331ac..0264d28057 100644 --- a/Data/ODBC/src/Unicode_WIN32.cpp +++ b/Data/ODBC/src/Unicode_WIN32.cpp @@ -24,9 +24,7 @@ using Poco::InvalidArgumentException; using Poco::NotImplementedException; -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { SQLRETURN SQLColAttribute(SQLHSTMT hstmt, @@ -797,4 +795,4 @@ SQLRETURN SQLDrivers(SQLHENV henv, } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/ODBC/src/Utility.cpp b/Data/ODBC/src/Utility.cpp index 0f7e8b4e95..1578924d8b 100644 --- a/Data/ODBC/src/Utility.cpp +++ b/Data/ODBC/src/Utility.cpp @@ -21,9 +21,7 @@ #include -namespace Poco { -namespace Data { -namespace ODBC { +namespace Poco::Data::ODBC { const TypeInfo Utility::_dataTypes; @@ -204,4 +202,4 @@ std::string Utility::driverODBCVersion(const ConnectionHandle& db) } -} } } // namespace Poco::Data::ODBC +} // namespace Poco::Data::ODBC diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/BinaryExtractor.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/BinaryExtractor.h index bf61bfdb4f..d044ef3d31 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/BinaryExtractor.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/BinaryExtractor.h @@ -29,9 +29,7 @@ #include "Poco/Dynamic/Var.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class PostgreSQL_API BinaryExtractor: public Poco::Data::AbstractExtractor @@ -432,7 +430,7 @@ inline bool BinaryExtractor::isColumnNull(const OutputParameter& anOutputParamet } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // SQL_PostgreSQL_BinaryExtractor_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h index b6d2ff34e2..ea3874a628 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Binder.h @@ -28,9 +28,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class PostgreSQL_API Binder: public Poco::Data::AbstractBinder @@ -258,7 +256,7 @@ class PostgreSQL_API Binder: public Poco::Data::AbstractBinder }; -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // Data_PostgreSQL_Binder_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h index 7dc0877ac7..a287b7cc4b 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Connector.h @@ -25,9 +25,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class PostgreSQL_API Connector: public Poco::Data::Connector @@ -57,7 +55,7 @@ class PostgreSQL_API Connector: public Poco::Data::Connector }; -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // Data_PostgreSQL_Connector_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h index c3d5cb73d5..351d9af541 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Extractor.h @@ -29,9 +29,7 @@ #include "Poco/Dynamic/Var.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class PostgreSQL_API Extractor: public Poco::Data::AbstractExtractor @@ -452,7 +450,7 @@ inline bool Extractor::isColumnNull(const OutputParameter& outputParameter) cons } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // SQL_PostgreSQL_Extractor_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h index a81bd72ebf..7a5de7df84 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLException.h @@ -24,9 +24,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class PostgreSQL_API PostgreSQLException: public Poco::Data::DataException @@ -151,7 +149,7 @@ inline const char* PostgreSQLException::sqlState() const noexcept -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif //SQL_PostgreSQL_PostgreSQLException_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h index f1a5ed80c3..658ed5a724 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h @@ -28,9 +28,7 @@ #include "Poco/Format.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class PostgreSQL_API PostgreSQLStatementImpl: public Poco::Data::StatementImpl @@ -94,7 +92,7 @@ class PostgreSQL_API PostgreSQLStatementImpl: public Poco::Data::StatementImpl }; -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // SQL_PostgreSQL_PostgreSQLStatementImpl_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h index fb681bf20b..f8308dae7e 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/PostgreSQLTypes.h @@ -23,9 +23,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { /// Oid constants duplicated from PostgreSQL "include/postgresql/server/catalog/pg_type.h" @@ -420,7 +418,7 @@ inline PGCancelFree::~PGCancelFree() } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // SQL_PostgreSQL_Types_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h index 0cdfbc72cd..f6387a4b87 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionHandle.h @@ -26,9 +26,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class SessionParameters @@ -311,7 +309,7 @@ inline bool SessionHandle::isAsynchronousCommit() const } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // SQL_PostgreSQL_SessionHandle_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h index 1f5edb0b0b..a43548edb2 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/SessionImpl.h @@ -25,9 +25,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class PostgreSQL_API SessionImpl: public Poco::Data::AbstractSessionImpl @@ -181,7 +179,7 @@ inline bool SessionImpl::isBinaryExtraction(const std::string&) const } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // SQL_PostgreSQL_SessionImpl_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h index 0951898388..c3ba9ee282 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/StatementExecutor.h @@ -27,9 +27,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class StatementExecutor @@ -116,7 +114,7 @@ inline StatementExecutor::operator PGresult* () } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // SQL_PostgreSQL_StatementExecutor_INCLUDED diff --git a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h index 60d7bb5b2b..64ea507c08 100644 --- a/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h +++ b/Data/PostgreSQL/include/Poco/Data/PostgreSQL/Utility.h @@ -23,9 +23,7 @@ #include "Poco/Data/Session.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { class PostgreSQL_API Utility @@ -75,7 +73,7 @@ inline SessionHandle* Utility::handle(Session& aSession) } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL #endif // SQL_PostgreSQL_Utility_INCLUDED diff --git a/Data/PostgreSQL/src/BinaryExtractor.cpp b/Data/PostgreSQL/src/BinaryExtractor.cpp index fb7209f059..400095f49c 100644 --- a/Data/PostgreSQL/src/BinaryExtractor.cpp +++ b/Data/PostgreSQL/src/BinaryExtractor.cpp @@ -21,9 +21,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { namespace @@ -1233,4 +1231,4 @@ bool BinaryExtractor::extract(std::size_t, std::list&) } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/Binder.cpp b/Data/PostgreSQL/src/Binder.cpp index 349b02af37..5a7177f574 100644 --- a/Data/PostgreSQL/src/Binder.cpp +++ b/Data/PostgreSQL/src/Binder.cpp @@ -17,9 +17,7 @@ #include "Poco/DateTimeFormat.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { Binder::Binder() @@ -679,4 +677,4 @@ void Binder::bind(std::size_t /*pos*/, const std::list& /*val*/, Di } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/Connector.cpp b/Data/PostgreSQL/src/Connector.cpp index a942795135..6a49566291 100644 --- a/Data/PostgreSQL/src/Connector.cpp +++ b/Data/PostgreSQL/src/Connector.cpp @@ -17,9 +17,7 @@ #include "Poco/Data/SessionFactory.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { const std::string Connector::KEY("postgresql"); @@ -59,4 +57,4 @@ void Connector::unregisterConnector() } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/Extractor.cpp b/Data/PostgreSQL/src/Extractor.cpp index b8f2b8e44c..3b81144e74 100644 --- a/Data/PostgreSQL/src/Extractor.cpp +++ b/Data/PostgreSQL/src/Extractor.cpp @@ -22,9 +22,7 @@ #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { Extractor::Extractor(StatementExecutor& st): @@ -1090,4 +1088,4 @@ bool Extractor::extract(std::size_t, std::list&) } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/PostgreSQLException.cpp b/Data/PostgreSQL/src/PostgreSQLException.cpp index 9580224407..dd5152b9ac 100644 --- a/Data/PostgreSQL/src/PostgreSQLException.cpp +++ b/Data/PostgreSQL/src/PostgreSQLException.cpp @@ -15,9 +15,7 @@ #include "Poco/Data/PostgreSQL/PostgreSQLException.h" #include -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { PostgreSQLException::PostgreSQLException(const std::string& aMessage): @@ -89,4 +87,4 @@ StatementException::StatementException(const std::string& aMessage,const char* p -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/PostgreSQLStatementImpl.cpp b/Data/PostgreSQL/src/PostgreSQLStatementImpl.cpp index 60493e9413..3962ced6e5 100644 --- a/Data/PostgreSQL/src/PostgreSQLStatementImpl.cpp +++ b/Data/PostgreSQL/src/PostgreSQLStatementImpl.cpp @@ -16,9 +16,7 @@ #include "Poco/Data/PostgreSQL/Extractor.h" #include "Poco/Data/PostgreSQL/BinaryExtractor.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { PostgreSQLStatementImpl::PostgreSQLStatementImpl(SessionImpl& aSessionImpl): @@ -169,4 +167,4 @@ Poco::Data::AbstractBinder::Ptr PostgreSQLStatementImpl::binder() } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/PostgreSQLTypes.cpp b/Data/PostgreSQL/src/PostgreSQLTypes.cpp index b66b2e0413..e735780e8f 100644 --- a/Data/PostgreSQL/src/PostgreSQLTypes.cpp +++ b/Data/PostgreSQL/src/PostgreSQLTypes.cpp @@ -15,9 +15,7 @@ #include "Poco/Data/PostgreSQL/PostgreSQLTypes.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { Poco::Data::MetaColumn::ColumnDataType oidToColumnDataType(const Oid anOID) @@ -109,4 +107,4 @@ Poco::Data::MetaColumn::ColumnDataType oidToColumnDataType(const Oid anOID) } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/SessionHandle.cpp b/Data/PostgreSQL/src/SessionHandle.cpp index c53635fced..8e37b1d4a7 100644 --- a/Data/PostgreSQL/src/SessionHandle.cpp +++ b/Data/PostgreSQL/src/SessionHandle.cpp @@ -22,9 +22,7 @@ #define POCO_POSTGRESQL_VERSION_NUMBER ((NDB_VERSION_MAJOR<<16) | (NDB_VERSION_MINOR<<8) | (NDB_VERSION_BUILD&0xFF)) -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { //const std::string SessionHandle::POSTGRESQL_READ_UNCOMMITTED = "READ UNCOMMITTED"; @@ -581,4 +579,4 @@ SessionParametersMap SessionHandle::connectionParameters() const } -} } } // Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/SessionImpl.cpp b/Data/PostgreSQL/src/SessionImpl.cpp index ec31fe651c..a553377afc 100644 --- a/Data/PostgreSQL/src/SessionImpl.cpp +++ b/Data/PostgreSQL/src/SessionImpl.cpp @@ -51,9 +51,7 @@ namespace } -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { SessionImpl::SessionImpl(const std::string& aConnectionString, std::size_t aLoginTimeout): @@ -269,4 +267,4 @@ void SessionImpl::setBinaryExtraction(const std::string& feature, bool enabled) } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/StatementExecutor.cpp b/Data/PostgreSQL/src/StatementExecutor.cpp index a9b31680a2..6fccb7cfa7 100644 --- a/Data/PostgreSQL/src/StatementExecutor.cpp +++ b/Data/PostgreSQL/src/StatementExecutor.cpp @@ -67,9 +67,7 @@ namespace } // namespace -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { StatementExecutor::StatementExecutor(SessionHandle& sessionHandle, bool binaryExtraction): @@ -422,4 +420,4 @@ void StatementExecutor::clearResults() } -} } } // Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/src/Utility.cpp b/Data/PostgreSQL/src/Utility.cpp index 3d215833d8..417adaef28 100644 --- a/Data/PostgreSQL/src/Utility.cpp +++ b/Data/PostgreSQL/src/Utility.cpp @@ -19,9 +19,7 @@ #include "Poco/NumberFormatter.h" -namespace Poco { -namespace Data { -namespace PostgreSQL { +namespace Poco::Data::PostgreSQL { std::string Utility::serverInfo(SessionHandle* aHandlePtr) @@ -84,4 +82,4 @@ std::string Utility::sessionEncoding(Poco::Data::Session& aSession) } -} } } // namespace Poco::Data::PostgreSQL +} // namespace Poco::Data::PostgreSQL diff --git a/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp b/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp index 9e803a779d..d064e68a10 100644 --- a/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp +++ b/Data/PostgreSQL/testsuite/src/SQLExecutor.cpp @@ -82,8 +82,7 @@ struct Person }; -namespace Poco { -namespace Data { +namespace Poco::Data { template <> @@ -136,7 +135,7 @@ class TypeHandler }; -} } // namespace Poco::Data +} // namespace Poco::Data SQLExecutor::SQLExecutor(const std::string& name, Poco::Data::Session* pSession): diff --git a/Data/SQLite/include/Poco/Data/SQLite/Binder.h b/Data/SQLite/include/Poco/Data/SQLite/Binder.h index 63c2089fec..f24d99a4fb 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Binder.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Binder.h @@ -26,9 +26,7 @@ #include -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { class SQLite_API Binder: public Poco::Data::AbstractBinder @@ -222,7 +220,7 @@ inline void Binder::bind(std::size_t pos, const Poco::Data::CLOB& val, Direction } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite #endif // Data_SQLite_Binder_INCLUDED diff --git a/Data/SQLite/include/Poco/Data/SQLite/Connector.h b/Data/SQLite/include/Poco/Data/SQLite/Connector.h index 54186ab158..f09b9aa6c1 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Connector.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Connector.h @@ -22,9 +22,7 @@ #include "Poco/Data/Connector.h" -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { class SQLite_API Connector: public Poco::Data::Connector @@ -73,7 +71,7 @@ inline const std::string& Connector::name() const } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite #endif // Data_SQLite_Connector_INCLUDED diff --git a/Data/SQLite/include/Poco/Data/SQLite/Extractor.h b/Data/SQLite/include/Poco/Data/SQLite/Extractor.h index 1599dbaa9d..65bb8b093d 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Extractor.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Extractor.h @@ -38,9 +38,7 @@ #include -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { class SQLite_API Extractor: public Poco::Data::AbstractExtractor @@ -623,7 +621,7 @@ inline bool Extractor::extract(std::size_t pos, Poco::Data::CLOB& val) } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite #endif // Data_SQLite_Extractor_INCLUDED diff --git a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h index 99c05125e8..8f12c754e8 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h @@ -28,9 +28,7 @@ #include -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { class SQLite_API Notifier @@ -208,7 +206,7 @@ inline const Poco::Dynamic::Var& Notifier::getValue() const } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite #endif // SQLite_Notifier_INCLUDED diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h index 7c067a793d..707758233a 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h @@ -22,9 +22,7 @@ #include "Poco/Data/DataException.h" -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { POCO_DECLARE_EXCEPTION(SQLite_API, SQLiteException, Poco::Data::DataException) @@ -54,7 +52,7 @@ POCO_DECLARE_EXCEPTION(SQLite_API, AuthorizationDeniedException, SQLiteException POCO_DECLARE_EXCEPTION(SQLite_API, TransactionException, SQLiteException) -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite #endif diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h index fe595cf700..b15fd32539 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h @@ -33,9 +33,7 @@ extern "C" } -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { class SQLite_API SQLiteStatementImpl: public Poco::Data::StatementImpl @@ -149,7 +147,7 @@ inline bool SQLiteStatementImpl::canCompile() const } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite #endif // Data_SQLite_SQLiteStatementImpl_INCLUDED diff --git a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h index ea0e2cdffa..5a6e2aa148 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SessionImpl.h @@ -33,9 +33,7 @@ extern "C" } -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { class SQLite_API SessionImpl: public Poco::Data::AbstractSessionImpl @@ -193,7 +191,7 @@ inline TransactionType SessionImpl::getTransactionType() const return _transactionType; } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite #endif // Data_SQLite_SessionImpl_INCLUDED diff --git a/Data/SQLite/include/Poco/Data/SQLite/Utility.h b/Data/SQLite/include/Poco/Data/SQLite/Utility.h index 7a1e1939cd..42cc427f8c 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Utility.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Utility.h @@ -34,9 +34,7 @@ extern "C" } -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { class SQLite_API Utility @@ -248,7 +246,7 @@ inline bool Utility::fileToMemory(const Session& session, const std::string& fil } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite #endif // SQLite_Utility_INCLUDED diff --git a/Data/SQLite/src/Binder.cpp b/Data/SQLite/src/Binder.cpp index 3cd07e063e..8459d7696d 100644 --- a/Data/SQLite/src/Binder.cpp +++ b/Data/SQLite/src/Binder.cpp @@ -26,9 +26,7 @@ using Poco::DateTimeFormatter; using Poco::DateTimeFormat; -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { Binder::Binder(sqlite3_stmt* pStmt): @@ -131,4 +129,4 @@ void Binder::checkReturn(int rc) } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/Connector.cpp b/Data/SQLite/src/Connector.cpp index 142d9cea77..e9fd49be8f 100644 --- a/Data/SQLite/src/Connector.cpp +++ b/Data/SQLite/src/Connector.cpp @@ -17,9 +17,7 @@ #include "Poco/Data/SessionFactory.h" #include -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { const std::string Connector::KEY("sqlite"); @@ -66,4 +64,4 @@ void Connector::enableSoftHeapLimit(int limit) } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/Extractor.cpp b/Data/SQLite/src/Extractor.cpp index 8d406a5968..b6f1e66610 100644 --- a/Data/SQLite/src/Extractor.cpp +++ b/Data/SQLite/src/Extractor.cpp @@ -28,9 +28,7 @@ using Poco::DateTimeParser; -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { Extractor::Extractor(sqlite3_stmt* pStmt): @@ -898,4 +896,4 @@ bool Extractor::extract(std::size_t pos, std::list& val) } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/Notifier.cpp b/Data/SQLite/src/Notifier.cpp index 9d27e988cf..a355f130cd 100644 --- a/Data/SQLite/src/Notifier.cpp +++ b/Data/SQLite/src/Notifier.cpp @@ -17,9 +17,7 @@ #include "Poco/Data/SQLite/Notifier.h" -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { Notifier::Notifier(const Session& session, EnabledEventType enabled): @@ -200,4 +198,4 @@ void Notifier::sqliteRollbackCallbackFn(void* pVal) } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/SQLiteException.cpp b/Data/SQLite/src/SQLiteException.cpp index f473786a8e..f06ca01e46 100644 --- a/Data/SQLite/src/SQLiteException.cpp +++ b/Data/SQLite/src/SQLiteException.cpp @@ -16,9 +16,7 @@ #include -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { POCO_IMPLEMENT_EXCEPTION(SQLiteException, Poco::Data::DataException, "SQLite exception") @@ -48,4 +46,4 @@ POCO_IMPLEMENT_EXCEPTION(AuthorizationDeniedException, SQLiteException, "Authori POCO_IMPLEMENT_EXCEPTION(TransactionException, SQLiteException, "Transaction exception") -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/SQLiteStatementImpl.cpp b/Data/SQLite/src/SQLiteStatementImpl.cpp index a644a55dc8..01c478d01c 100644 --- a/Data/SQLite/src/SQLiteStatementImpl.cpp +++ b/Data/SQLite/src/SQLiteStatementImpl.cpp @@ -21,9 +21,7 @@ #include -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { const int SQLiteStatementImpl::POCO_SQLITE_INV_ROW_CNT = -1; @@ -309,4 +307,4 @@ int SQLiteStatementImpl::affectedRowCount() const } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/SessionImpl.cpp b/Data/SQLite/src/SessionImpl.cpp index de0f7d57be..8c4b473eed 100644 --- a/Data/SQLite/src/SessionImpl.cpp +++ b/Data/SQLite/src/SessionImpl.cpp @@ -30,9 +30,7 @@ #endif -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { const std::string SessionImpl::DEFERRED_BEGIN_TRANSACTION("BEGIN DEFERRED"); @@ -312,4 +310,4 @@ sqlite3* Utility::dbHandle(const Session& session) } -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite diff --git a/Data/SQLite/src/Utility.cpp b/Data/SQLite/src/Utility.cpp index 7f56266c72..05d06201ac 100644 --- a/Data/SQLite/src/Utility.cpp +++ b/Data/SQLite/src/Utility.cpp @@ -28,9 +28,7 @@ #endif -namespace Poco { -namespace Data { -namespace SQLite { +namespace Poco::Data::SQLite { const std::string Utility::TRANSACTION_TYPE_PROPERTY_KEY = "transactionType"; @@ -352,4 +350,4 @@ void* Utility::eventHookRegister(sqlite3* pDB, RollbackCallbackType callbackFn, // for a discussion. -} } } // namespace Poco::Data::SQLite +} // namespace Poco::Data::SQLite diff --git a/Data/SQLite/testsuite/src/SQLiteTest.cpp b/Data/SQLite/testsuite/src/SQLiteTest.cpp index f2cc87d282..0d6c332a74 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.cpp +++ b/Data/SQLite/testsuite/src/SQLiteTest.cpp @@ -172,8 +172,7 @@ class Person }; -namespace Poco { -namespace Data { +namespace Poco::Data { template <> @@ -237,7 +236,7 @@ class TypeHandler }; -} } // namespace Poco::Data +} // namespace Poco::Data RecordSet getRecordsetMove(Session& session, const std::string& sql) diff --git a/Data/SQLite/testsuite/src/SQLiteTest.h b/Data/SQLite/testsuite/src/SQLiteTest.h index d2fc56ff67..d117bd57cd 100644 --- a/Data/SQLite/testsuite/src/SQLiteTest.h +++ b/Data/SQLite/testsuite/src/SQLiteTest.h @@ -18,12 +18,11 @@ #include "CppUnit/TestCase.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Session; -} } +} // namespace Poco::Data class SQLiteTest: public CppUnit::TestCase diff --git a/Data/include/Poco/Data/AbstractBinder.h b/Data/include/Poco/Data/AbstractBinder.h index a76f10d57f..886b7e98f4 100644 --- a/Data/include/Poco/Data/AbstractBinder.h +++ b/Data/include/Poco/Data/AbstractBinder.h @@ -35,8 +35,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { using NullData = NullType; @@ -402,7 +401,7 @@ inline bool AbstractBinder::transcodeRequired() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_AbstractBinder_INCLUDED diff --git a/Data/include/Poco/Data/AbstractBinding.h b/Data/include/Poco/Data/AbstractBinding.h index 4791d4b5e1..8e7450c5ec 100644 --- a/Data/include/Poco/Data/AbstractBinding.h +++ b/Data/include/Poco/Data/AbstractBinding.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API AbstractBinding @@ -138,7 +137,7 @@ inline Poco::UInt32 AbstractBinding::bulkSize() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_AbstractBinding_INCLUDED diff --git a/Data/include/Poco/Data/AbstractExtraction.h b/Data/include/Poco/Data/AbstractExtraction.h index ea3fb168f1..9e4e94fbb3 100644 --- a/Data/include/Poco/Data/AbstractExtraction.h +++ b/Data/include/Poco/Data/AbstractExtraction.h @@ -31,8 +31,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class AbstractPreparator; @@ -292,7 +291,7 @@ inline bool AbstractExtraction::isValueNull(const Poco::UTF16String& str, bool d } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_AbstractExtraction_INCLUDED diff --git a/Data/include/Poco/Data/AbstractPreparation.h b/Data/include/Poco/Data/AbstractPreparation.h index 3935388aa9..bda3cbb944 100644 --- a/Data/include/Poco/Data/AbstractPreparation.h +++ b/Data/include/Poco/Data/AbstractPreparation.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API AbstractPreparation @@ -65,7 +64,7 @@ inline AbstractPreparation::PreparatorPtr AbstractPreparation::preparation() } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_AbstractPreparation_INCLUDED diff --git a/Data/include/Poco/Data/AbstractSessionImpl.h b/Data/include/Poco/Data/AbstractSessionImpl.h index 5317d2e850..a4f5b8413c 100644 --- a/Data/include/Poco/Data/AbstractSessionImpl.h +++ b/Data/include/Poco/Data/AbstractSessionImpl.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -392,7 +391,7 @@ class AbstractSessionImpl: public SessionImpl }; -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_AbstractSessionImpl_INCLUDED diff --git a/Data/include/Poco/Data/ArchiveStrategy.h b/Data/include/Poco/Data/ArchiveStrategy.h index b0fe631a70..7fc6036f00 100644 --- a/Data/include/Poco/Data/ArchiveStrategy.h +++ b/Data/include/Poco/Data/ArchiveStrategy.h @@ -26,8 +26,7 @@ #include "Poco/SharedPtr.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API ArchiveStrategy @@ -217,7 +216,7 @@ inline const std::string& ArchiveByAgeStrategy::getThreshold() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_ArchiveStrategy_INCLUDED diff --git a/Data/include/Poco/Data/AutoTransaction.h b/Data/include/Poco/Data/AutoTransaction.h index 4d6603217c..82cfb690bd 100644 --- a/Data/include/Poco/Data/AutoTransaction.h +++ b/Data/include/Poco/Data/AutoTransaction.h @@ -22,14 +22,13 @@ #include "Poco/Data/Transaction.h" -namespace Poco { -namespace Data { +namespace Poco::Data { using AutoTransaction = Transaction; -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_AutoTransaction_INCLUDED diff --git a/Data/include/Poco/Data/Binding.h b/Data/include/Poco/Data/Binding.h index 180c8d1ebf..f6fed660f7 100644 --- a/Data/include/Poco/Data/Binding.h +++ b/Data/include/Poco/Data/Binding.h @@ -33,8 +33,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -1440,7 +1439,7 @@ inline AbstractBinding::Ptr bind(T t) } // namespace Keywords -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Binding_INCLUDED diff --git a/Data/include/Poco/Data/Bulk.h b/Data/include/Poco/Data/Bulk.h index 20f2ebc679..d4cdbfdbef 100644 --- a/Data/include/Poco/Data/Bulk.h +++ b/Data/include/Poco/Data/Bulk.h @@ -22,8 +22,7 @@ #include "Poco/Data/Limit.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API Bulk @@ -90,7 +89,7 @@ inline void bulk(Void) using BulkFnType = void (*)(Void); -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Bulk_INCLUDED diff --git a/Data/include/Poco/Data/BulkBinding.h b/Data/include/Poco/Data/BulkBinding.h index 3d61d49772..1d8ae7198a 100644 --- a/Data/include/Poco/Data/BulkBinding.h +++ b/Data/include/Poco/Data/BulkBinding.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -142,7 +141,7 @@ AbstractBinding::Ptr in(const std::list& t, BulkFnType, const std::string& na } // namespace Keywords -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_BulkBinding_INCLUDED diff --git a/Data/include/Poco/Data/BulkExtraction.h b/Data/include/Poco/Data/BulkExtraction.h index 33525a5f4d..5981147a53 100644 --- a/Data/include/Poco/Data/BulkExtraction.h +++ b/Data/include/Poco/Data/BulkExtraction.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -273,7 +272,7 @@ AbstractExtraction::Ptr into(std::list& t, BulkFnType, const Position& pos = } // namespace Keywords -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_BulkExtraction_INCLUDED diff --git a/Data/include/Poco/Data/Column.h b/Data/include/Poco/Data/Column.h index d16aecc9ae..cd4c989bc8 100644 --- a/Data/include/Poco/Data/Column.h +++ b/Data/include/Poco/Data/Column.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -493,7 +492,7 @@ inline void swap(Column& c1, Column& c2) noexcept } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Column_INCLUDED diff --git a/Data/include/Poco/Data/Connector.h b/Data/include/Poco/Data/Connector.h index ee922f4e0f..f136ba824a 100644 --- a/Data/include/Poco/Data/Connector.h +++ b/Data/include/Poco/Data/Connector.h @@ -23,8 +23,7 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API Connector @@ -50,7 +49,7 @@ class Data_API Connector }; -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Connector_INCLUDED diff --git a/Data/include/Poco/Data/Constants.h b/Data/include/Poco/Data/Constants.h index 2426e70855..455032eba1 100644 --- a/Data/include/Poco/Data/Constants.h +++ b/Data/include/Poco/Data/Constants.h @@ -23,14 +23,13 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { inline const std::size_t POCO_DATA_INVALID_ROW = std::numeric_limits::max(); -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Constants_INCLUDED diff --git a/Data/include/Poco/Data/DataException.h b/Data/include/Poco/Data/DataException.h index cc976e2fac..4aade7ecdc 100644 --- a/Data/include/Poco/Data/DataException.h +++ b/Data/include/Poco/Data/DataException.h @@ -22,8 +22,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Data { +namespace Poco::Data { POCO_DECLARE_EXCEPTION(Data_API, DataException, Poco::IOException) @@ -44,7 +43,7 @@ POCO_DECLARE_EXCEPTION(Data_API, ConnectionFailedException, DataException) POCO_DECLARE_EXCEPTION(Data_API, NotConnectedException, DataException) -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_DataException_INCLUDED diff --git a/Data/include/Poco/Data/Date.h b/Data/include/Poco/Data/Date.h index 18167b48f4..5101a463bf 100644 --- a/Data/include/Poco/Data/Date.h +++ b/Data/include/Poco/Data/Date.h @@ -163,8 +163,7 @@ inline bool Date::operator > (const Date& date) const // -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template <> @@ -226,8 +225,7 @@ class VarHolderImpl: public VarHolder }; -} // namespace Dynamic -} // namespace Poco +} // namespace Poco::Dynamic #endif // Data_Date_INCLUDED diff --git a/Data/include/Poco/Data/DynamicDateTime.h b/Data/include/Poco/Data/DynamicDateTime.h index 0ed8730540..8fc066fa50 100644 --- a/Data/include/Poco/Data/DynamicDateTime.h +++ b/Data/include/Poco/Data/DynamicDateTime.h @@ -24,24 +24,22 @@ #include "Poco/Dynamic/Var.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Date; class Time; -} } // namespace Poco::Data +} // namespace Poco::Data -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template <> Data_API Var::operator Poco::Data::Date () const; template <> Data_API Var::operator Poco::Data::Time () const; -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // Data_DynamicDateTime_INCLUDED diff --git a/Data/include/Poco/Data/DynamicLOB.h b/Data/include/Poco/Data/DynamicLOB.h index fc33bbba65..eb8c52eb97 100644 --- a/Data/include/Poco/Data/DynamicLOB.h +++ b/Data/include/Poco/Data/DynamicLOB.h @@ -23,23 +23,21 @@ #include "Poco/Dynamic/Var.h" -namespace Poco { -namespace Data { +namespace Poco::Data { template class LOB; using BLOB = LOB; using CLOB = LOB; -} } // namespace Poco::Data +} // namespace Poco::Data -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template <> Data_API Var::operator Poco::Data::CLOB () const; template <> Data_API Var::operator Poco::Data::BLOB () const; -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // Data_DynamicLOB_INCLUDED diff --git a/Data/include/Poco/Data/Extraction.h b/Data/include/Poco/Data/Extraction.h index e27569a09a..7f429a3be3 100644 --- a/Data/include/Poco/Data/Extraction.h +++ b/Data/include/Poco/Data/Extraction.h @@ -33,8 +33,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -841,7 +840,7 @@ inline AbstractExtractionVec& into(AbstractExtractionVec& ev) } // namespace Keywords -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Extraction_INCLUDED diff --git a/Data/include/Poco/Data/JSONRowFormatter.h b/Data/include/Poco/Data/JSONRowFormatter.h index 8308e9ab4d..cc8334e70a 100644 --- a/Data/include/Poco/Data/JSONRowFormatter.h +++ b/Data/include/Poco/Data/JSONRowFormatter.h @@ -21,8 +21,7 @@ #include "Poco/Data/RowFormatter.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API JSONRowFormatter: public Poco::Data::RowFormatter @@ -153,7 +152,7 @@ inline bool JSONRowFormatter::isFull() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_JSONRowFormatter_INCLUDED diff --git a/Data/include/Poco/Data/LOB.h b/Data/include/Poco/Data/LOB.h index 7522fb7b19..361ab9b1e0 100644 --- a/Data/include/Poco/Data/LOB.h +++ b/Data/include/Poco/Data/LOB.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -242,7 +241,7 @@ inline void swap(LOB& b1, LOB& b2) noexcept } -} } // namespace Poco::Data +} // namespace Poco::Data namespace std @@ -268,8 +267,7 @@ namespace std // -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template <> @@ -348,7 +346,7 @@ class VarHolderImpl: public VarHolder }; -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // Data_LOB_INCLUDED diff --git a/Data/include/Poco/Data/LOBStream.h b/Data/include/Poco/Data/LOBStream.h index a5f9ef7017..7d54601f5d 100644 --- a/Data/include/Poco/Data/LOBStream.h +++ b/Data/include/Poco/Data/LOBStream.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -144,7 +143,7 @@ using CLOBOutputStream = LOBOutputStream; using BLOBInputStream = LOBInputStream; using CLOBInputStream = LOBInputStream; -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_LOBStream_INCLUDED diff --git a/Data/include/Poco/Data/Limit.h b/Data/include/Poco/Data/Limit.h index 80dcdc27cf..25bec6e57c 100644 --- a/Data/include/Poco/Data/Limit.h +++ b/Data/include/Poco/Data/Limit.h @@ -21,8 +21,7 @@ #include "Poco/Data/Data.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API Limit @@ -107,7 +106,7 @@ inline bool Limit::operator != (const Limit& other) const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Limit_INCLUDED diff --git a/Data/include/Poco/Data/MetaColumn.h b/Data/include/Poco/Data/MetaColumn.h index 0c0fb3713d..cb5505e950 100644 --- a/Data/include/Poco/Data/MetaColumn.h +++ b/Data/include/Poco/Data/MetaColumn.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API MetaColumn @@ -199,7 +198,7 @@ inline void MetaColumn::setNullable(bool nullable) } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_MetaColumn_INCLUDED diff --git a/Data/include/Poco/Data/PooledSessionHolder.h b/Data/include/Poco/Data/PooledSessionHolder.h index fbf2b70e37..a1adf27867 100644 --- a/Data/include/Poco/Data/PooledSessionHolder.h +++ b/Data/include/Poco/Data/PooledSessionHolder.h @@ -25,8 +25,7 @@ #include "Poco/Mutex.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class SessionPool; @@ -93,7 +92,7 @@ inline int PooledSessionHolder::idle() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_PooledSessionHolder_INCLUDED diff --git a/Data/include/Poco/Data/PooledSessionImpl.h b/Data/include/Poco/Data/PooledSessionImpl.h index 36afae8a21..f30b25048e 100644 --- a/Data/include/Poco/Data/PooledSessionImpl.h +++ b/Data/include/Poco/Data/PooledSessionImpl.h @@ -25,8 +25,7 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class SessionPool; @@ -95,7 +94,7 @@ inline SessionImpl* PooledSessionImpl::impl() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_PooledSessionImpl_INCLUDED diff --git a/Data/include/Poco/Data/Position.h b/Data/include/Poco/Data/Position.h index 19ba555431..76c3a4389b 100644 --- a/Data/include/Poco/Data/Position.h +++ b/Data/include/Poco/Data/Position.h @@ -21,8 +21,7 @@ #include "Poco/Data/Limit.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API Position @@ -69,7 +68,7 @@ inline Position from(const T& value) } // namespace Keywords -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Position_INCLUDED diff --git a/Data/include/Poco/Data/Preparation.h b/Data/include/Poco/Data/Preparation.h index 6491b62d51..1370ab894c 100644 --- a/Data/include/Poco/Data/Preparation.h +++ b/Data/include/Poco/Data/Preparation.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { template @@ -148,7 +147,7 @@ class Preparation>: public AbstractPreparation }; -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Preparation_INCLUDED diff --git a/Data/include/Poco/Data/Range.h b/Data/include/Poco/Data/Range.h index 08222a43c8..e27f181fd9 100644 --- a/Data/include/Poco/Data/Range.h +++ b/Data/include/Poco/Data/Range.h @@ -22,8 +22,7 @@ #include "Poco/Data/Limit.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API Range @@ -98,7 +97,7 @@ Range range(T low, T upp, bool hard = false) } // namespace Keywords -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Range_INCLUDED diff --git a/Data/include/Poco/Data/RecordSet.h b/Data/include/Poco/Data/RecordSet.h index fb3fe2278c..62f1f6ac82 100644 --- a/Data/include/Poco/Data/RecordSet.h +++ b/Data/include/Poco/Data/RecordSet.h @@ -30,8 +30,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class RowFilter; @@ -579,7 +578,7 @@ inline void RecordSet::formatNames() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_RecordSet_INCLUDED diff --git a/Data/include/Poco/Data/Row.h b/Data/include/Poco/Data/Row.h index 5c4b4f3b98..8c9ea3383e 100644 --- a/Data/include/Poco/Data/Row.h +++ b/Data/include/Poco/Data/Row.h @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class RecordSet; @@ -306,7 +305,7 @@ inline void Row::formatValues() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Row_INCLUDED diff --git a/Data/include/Poco/Data/RowFilter.h b/Data/include/Poco/Data/RowFilter.h index 4bec4c49e7..413232518d 100644 --- a/Data/include/Poco/Data/RowFilter.h +++ b/Data/include/Poco/Data/RowFilter.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class RecordSet; @@ -270,7 +269,7 @@ inline bool RowFilter::isNull(const Poco::Dynamic::Var& p1, const Poco::Dynamic: } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_RowFilter_INCLUDED diff --git a/Data/include/Poco/Data/RowFormatter.h b/Data/include/Poco/Data/RowFormatter.h index e916d4f925..1d9fdf96f1 100644 --- a/Data/include/Poco/Data/RowFormatter.h +++ b/Data/include/Poco/Data/RowFormatter.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API RowFormatter @@ -231,7 +230,7 @@ inline RowFormatter::Ptr format(const T& formatter) } // namespace Keywords -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_RowFormatter_INCLUDED diff --git a/Data/include/Poco/Data/RowIterator.h b/Data/include/Poco/Data/RowIterator.h index e1e32cb490..e76f1e7fdc 100644 --- a/Data/include/Poco/Data/RowIterator.h +++ b/Data/include/Poco/Data/RowIterator.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class RecordSet; @@ -138,7 +137,7 @@ inline bool RowIterator::operator != (const RowIterator& other) const } -} } // namespace Poco::Data +} // namespace Poco::Data namespace std diff --git a/Data/include/Poco/Data/SQLChannel.h b/Data/include/Poco/Data/SQLChannel.h index 7ca280c131..3e6313b1c2 100644 --- a/Data/include/Poco/Data/SQLChannel.h +++ b/Data/include/Poco/Data/SQLChannel.h @@ -36,8 +36,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API SQLChannel: public Poco::Channel, Poco::Runnable @@ -354,7 +353,7 @@ inline bool SQLChannel::shouldFlush() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_SQLChannel_INCLUDED diff --git a/Data/include/Poco/Data/Session.h b/Data/include/Poco/Data/Session.h index 1ebc1cb99a..f2267cb18f 100644 --- a/Data/include/Poco/Data/Session.h +++ b/Data/include/Poco/Data/Session.h @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class StatementImpl; @@ -529,7 +528,7 @@ inline void swap(Session& s1, Session& s2) } -} } // namespace Poco::Data +} // namespace Poco::Data namespace std diff --git a/Data/include/Poco/Data/SessionFactory.h b/Data/include/Poco/Data/SessionFactory.h index 7dc79bb242..176c1cf899 100644 --- a/Data/include/Poco/Data/SessionFactory.h +++ b/Data/include/Poco/Data/SessionFactory.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API SessionFactory @@ -93,7 +92,7 @@ class Data_API SessionFactory }; -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_SessionFactory_INCLUDED diff --git a/Data/include/Poco/Data/SessionImpl.h b/Data/include/Poco/Data/SessionImpl.h index b9e95fce68..9c55f5b57e 100644 --- a/Data/include/Poco/Data/SessionImpl.h +++ b/Data/include/Poco/Data/SessionImpl.h @@ -26,8 +26,7 @@ #include "Poco/Any.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class StatementImpl; @@ -278,7 +277,7 @@ inline bool SessionImpl::shouldParse() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_SessionImpl_INCLUDED diff --git a/Data/include/Poco/Data/SessionPool.h b/Data/include/Poco/Data/SessionPool.h index e1f9e9be7b..7bfc944076 100644 --- a/Data/include/Poco/Data/SessionPool.h +++ b/Data/include/Poco/Data/SessionPool.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API SessionPool: public RefCountedObject @@ -232,7 +231,7 @@ inline bool SessionPool::isActive() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_SessionPool_INCLUDED diff --git a/Data/include/Poco/Data/SessionPoolContainer.h b/Data/include/Poco/Data/SessionPoolContainer.h index a1479b1802..2256c401df 100644 --- a/Data/include/Poco/Data/SessionPoolContainer.h +++ b/Data/include/Poco/Data/SessionPoolContainer.h @@ -25,8 +25,7 @@ #include "Poco/Mutex.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API SessionPoolContainer @@ -108,7 +107,7 @@ inline int SessionPoolContainer::count() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_SessionPoolContainer_INCLUDED diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h index c9a2cfa4c8..48392e07a9 100644 --- a/Data/include/Poco/Data/SimpleRowFormatter.h +++ b/Data/include/Poco/Data/SimpleRowFormatter.h @@ -22,8 +22,7 @@ #include "Poco/Data/RowFormatter.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API SimpleRowFormatter: public RowFormatter @@ -104,7 +103,7 @@ inline std::streamsize SimpleRowFormatter::getSpacing() const } -} } // namespace Poco::Data +} // namespace Poco::Data #ifndef POCO_DOC diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h index b2abc813a3..f3ce21b4bb 100644 --- a/Data/include/Poco/Data/Statement.h +++ b/Data/include/Poco/Data/Statement.h @@ -41,8 +41,7 @@ namespace hsql { #endif // POCO_DATA_NO_SQL_PARSER -namespace Poco { -namespace Data { +namespace Poco::Data { #ifndef POCO_DATA_NO_SQL_PARSER @@ -967,7 +966,7 @@ inline void swap(Statement& s1, Statement& s2) noexcept } -} } // namespace Poco::Data +} // namespace Poco::Data namespace std diff --git a/Data/include/Poco/Data/StatementCreator.h b/Data/include/Poco/Data/StatementCreator.h index 4943ab99a9..fe39c0594c 100644 --- a/Data/include/Poco/Data/StatementCreator.h +++ b/Data/include/Poco/Data/StatementCreator.h @@ -24,8 +24,7 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API StatementCreator @@ -93,7 +92,7 @@ inline void StatementCreator::reset() } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_StatementCreator_INCLUDED diff --git a/Data/include/Poco/Data/StatementImpl.h b/Data/include/Poco/Data/StatementImpl.h index 938b1a2d89..686abbfa36 100644 --- a/Data/include/Poco/Data/StatementImpl.h +++ b/Data/include/Poco/Data/StatementImpl.h @@ -38,8 +38,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API StatementImpl @@ -641,7 +640,7 @@ inline bool StatementImpl::hasMoreDataSets() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_StatementImpl_INCLUDED diff --git a/Data/include/Poco/Data/Transaction.h b/Data/include/Poco/Data/Transaction.h index f1d1979c18..79df574a6f 100644 --- a/Data/include/Poco/Data/Transaction.h +++ b/Data/include/Poco/Data/Transaction.h @@ -24,8 +24,7 @@ #include "Poco/Logger.h" -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API Transaction @@ -196,7 +195,7 @@ inline void Transaction::setLogger(Poco::Logger* pLogger) } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Transaction_INCLUDED diff --git a/Data/include/Poco/Data/Transcoder.h b/Data/include/Poco/Data/Transcoder.h index c9d5211ed6..78bceb024e 100644 --- a/Data/include/Poco/Data/Transcoder.h +++ b/Data/include/Poco/Data/Transcoder.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { class Data_API Transcoder @@ -91,7 +90,7 @@ inline std::string Transcoder::toEncoding() const } -} } // namespace Poco::Data +} // namespace Poco::Data #endif // Data_Transcoder_INCLUDED diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h index e05b32ba14..96594c3248 100644 --- a/Data/include/Poco/Data/TypeHandler.h +++ b/Data/include/Poco/Data/TypeHandler.h @@ -37,8 +37,7 @@ #pragma warning(disable : 4624) #endif -namespace Poco { -namespace Data { +namespace Poco::Data { class AbstractTypeHandler @@ -535,7 +534,7 @@ class TypeHandler>: public AbstractTypeHandler }; -} } // namespace Poco::Data +} // namespace Poco::Data #if defined(POCO_COMPILER_GCC) && (__GNUC__ >= 12) #pragma GCC diagnostic pop diff --git a/Data/samples/TypeHandler/src/TypeHandler.cpp b/Data/samples/TypeHandler/src/TypeHandler.cpp index 04f0fb9d99..8bb5700e45 100644 --- a/Data/samples/TypeHandler/src/TypeHandler.cpp +++ b/Data/samples/TypeHandler/src/TypeHandler.cpp @@ -35,8 +35,7 @@ struct Person }; -namespace Poco { -namespace Data { +namespace Poco::Data { template <> @@ -76,7 +75,7 @@ class TypeHandler }; -} } // namespace Poco::Data +} // namespace Poco::Data int main(int argc, char** argv) diff --git a/Data/src/AbstractBinder.cpp b/Data/src/AbstractBinder.cpp index d8397ea368..a542a41be2 100644 --- a/Data/src/AbstractBinder.cpp +++ b/Data/src/AbstractBinder.cpp @@ -23,8 +23,7 @@ #include "Poco/Dynamic/Var.h" -namespace Poco { -namespace Data { +namespace Poco::Data { AbstractBinder::AbstractBinder(Poco::TextEncoding::Ptr pFromEncoding, @@ -568,4 +567,4 @@ void AbstractBinder::bind(std::size_t pos, const Poco::Dynamic::Var& val, Direct } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/AbstractBinding.cpp b/Data/src/AbstractBinding.cpp index 40e323499c..6cafc4392a 100644 --- a/Data/src/AbstractBinding.cpp +++ b/Data/src/AbstractBinding.cpp @@ -15,8 +15,7 @@ #include "Poco/Data/AbstractBinding.h" -namespace Poco { -namespace Data { +namespace Poco::Data { AbstractBinding::AbstractBinding(const std::string& name, @@ -42,4 +41,4 @@ void AbstractBinding::setBinder(BinderPtr pBinder) } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/AbstractExtraction.cpp b/Data/src/AbstractExtraction.cpp index d612fb4950..b9657a1f15 100644 --- a/Data/src/AbstractExtraction.cpp +++ b/Data/src/AbstractExtraction.cpp @@ -15,8 +15,7 @@ #include "Poco/Data/AbstractExtraction.h" -namespace Poco { -namespace Data { +namespace Poco::Data { AbstractExtraction::AbstractExtraction(Poco::UInt32 limit, @@ -37,4 +36,4 @@ AbstractExtraction::~AbstractExtraction() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/AbstractExtractor.cpp b/Data/src/AbstractExtractor.cpp index ef5b083465..a985537003 100644 --- a/Data/src/AbstractExtractor.cpp +++ b/Data/src/AbstractExtractor.cpp @@ -17,8 +17,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Data { +namespace Poco::Data { AbstractExtractor::AbstractExtractor(Poco::TextEncoding::Ptr pDBEncoding, @@ -235,4 +234,4 @@ bool AbstractExtractor::extract(std::size_t pos, Poco::Nullable -namespace Poco { -namespace Data { +namespace Poco::Data { POCO_IMPLEMENT_EXCEPTION(DataException, Poco::IOException, "Database Exception") @@ -38,4 +37,4 @@ POCO_IMPLEMENT_EXCEPTION(ConnectionFailedException, DataException, "Connection a POCO_IMPLEMENT_EXCEPTION(NotConnectedException, DataException, "Not connected to data source") -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Date.cpp b/Data/src/Date.cpp index 302b6a1d41..93f938a590 100644 --- a/Data/src/Date.cpp +++ b/Data/src/Date.cpp @@ -24,8 +24,7 @@ using Poco::Dynamic::Var; using Poco::NumberFormatter; -namespace Poco { -namespace Data { +namespace Poco::Data { Date::Date() @@ -103,14 +102,13 @@ Date& Date::operator = (const Var& var) } -} } // namespace Poco::Data +} // namespace Poco::Data #ifdef __GNUC__ // only needed for g++ (see comment in Date::operator = above) -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { using Poco::Data::Date; @@ -136,7 +134,7 @@ Var::operator Date () const } -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // __GNUC__ diff --git a/Data/src/DynamicLOB.cpp b/Data/src/DynamicLOB.cpp index 5dfe3df857..665dfd84d3 100644 --- a/Data/src/DynamicLOB.cpp +++ b/Data/src/DynamicLOB.cpp @@ -20,8 +20,7 @@ #include "Poco/Dynamic/Var.h" -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { using Poco::Data::CLOB; @@ -67,7 +66,7 @@ Var::operator BLOB () const } -} } // namespace Poco::Data +} // namespace Poco::Dynamic #endif // __GNUC__ diff --git a/Data/src/JSONRowFormatter.cpp b/Data/src/JSONRowFormatter.cpp index 3d5dc4fe2b..cd4796224b 100644 --- a/Data/src/JSONRowFormatter.cpp +++ b/Data/src/JSONRowFormatter.cpp @@ -23,8 +23,7 @@ using Poco::format; using Poco::toJSON; -namespace Poco { -namespace Data { +namespace Poco::Data { const int JSONRowFormatter::JSON_FMT_MODE_SMALL; @@ -186,4 +185,4 @@ std::string& JSONRowFormatter::formatNames(const NameVecPtr pNames, std::string& } -} }// namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Limit.cpp b/Data/src/Limit.cpp index 3a111e34f9..e2a2918bae 100644 --- a/Data/src/Limit.cpp +++ b/Data/src/Limit.cpp @@ -15,8 +15,7 @@ #include "Poco/Data/Limit.h" -namespace Poco { -namespace Data { +namespace Poco::Data { Limit::Limit(SizeT value, bool hardLimit, bool isLowerLimit) : @@ -32,4 +31,4 @@ Limit::~Limit() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/MetaColumn.cpp b/Data/src/MetaColumn.cpp index cf1de736c9..646ad29616 100644 --- a/Data/src/MetaColumn.cpp +++ b/Data/src/MetaColumn.cpp @@ -15,8 +15,7 @@ #include "Poco/Data/MetaColumn.h" -namespace Poco { -namespace Data { +namespace Poco::Data { MetaColumn::MetaColumn(): @@ -103,4 +102,4 @@ void MetaColumn::swap(MetaColumn& other) noexcept } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/PooledSessionHolder.cpp b/Data/src/PooledSessionHolder.cpp index 80d35e2a61..da68de1c9b 100644 --- a/Data/src/PooledSessionHolder.cpp +++ b/Data/src/PooledSessionHolder.cpp @@ -15,8 +15,7 @@ #include "Poco/Data/PooledSessionHolder.h" -namespace Poco { -namespace Data { +namespace Poco::Data { PooledSessionHolder::PooledSessionHolder(SessionPool& owner, SessionImpl* pSessionImpl): @@ -31,4 +30,4 @@ PooledSessionHolder::~PooledSessionHolder() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/PooledSessionImpl.cpp b/Data/src/PooledSessionImpl.cpp index 0b54697a19..19c05cfbcf 100644 --- a/Data/src/PooledSessionImpl.cpp +++ b/Data/src/PooledSessionImpl.cpp @@ -17,8 +17,7 @@ #include "Poco/Data/SessionPool.h" -namespace Poco { -namespace Data { +namespace Poco::Data { PooledSessionImpl::PooledSessionImpl(PooledSessionHolder* pHolder): @@ -213,4 +212,4 @@ SessionImpl* PooledSessionImpl::access() const } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Position.cpp b/Data/src/Position.cpp index 64db6fca70..b36336ea4d 100644 --- a/Data/src/Position.cpp +++ b/Data/src/Position.cpp @@ -15,8 +15,7 @@ #include "Poco/Data/Position.h" -namespace Poco { -namespace Data { +namespace Poco::Data { Position::Position(Poco::UInt32 value): _value(value) @@ -29,4 +28,4 @@ Position::~Position() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Range.cpp b/Data/src/Range.cpp index d41fde130d..e8348b926e 100644 --- a/Data/src/Range.cpp +++ b/Data/src/Range.cpp @@ -16,8 +16,7 @@ #include "Poco/Data/DataException.h" -namespace Poco { -namespace Data { +namespace Poco::Data { using namespace Keywords; @@ -37,4 +36,4 @@ Range::~Range() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/RecordSet.cpp b/Data/src/RecordSet.cpp index 1b2e1b14e3..8467ec9035 100644 --- a/Data/src/RecordSet.cpp +++ b/Data/src/RecordSet.cpp @@ -27,8 +27,7 @@ using Poco::DateTime; using Poco::UTF16String; -namespace Poco { -namespace Data { +namespace Poco::Data { const std::size_t RecordSet::UNKNOWN_TOTAL_ROW_COUNT = std::numeric_limits::max(); @@ -689,4 +688,4 @@ void RecordSet::setTotalRowCount(const std::string& sql) } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Row.cpp b/Data/src/Row.cpp index 3838fa365f..23cc456b72 100644 --- a/Data/src/Row.cpp +++ b/Data/src/Row.cpp @@ -18,8 +18,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Data { +namespace Poco::Data { std::ostream& operator << (std::ostream &os, const Row& row) @@ -366,4 +365,4 @@ void Row::formatNames() const } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/RowFilter.cpp b/Data/src/RowFilter.cpp index 5182c22945..8e0fcc0ad8 100644 --- a/Data/src/RowFilter.cpp +++ b/Data/src/RowFilter.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { RowFilter::RowFilter(RecordSet* pRecordSet): _pRecordSet(pRecordSet), _not(false) @@ -222,4 +221,4 @@ void RowFilter::rewindRecordSet() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/RowFormatter.cpp b/Data/src/RowFormatter.cpp index 56564e9a93..0c80a3489c 100644 --- a/Data/src/RowFormatter.cpp +++ b/Data/src/RowFormatter.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { RowFormatter::RowFormatter(const std::string& prefix, @@ -83,4 +82,4 @@ void RowFormatter::adjustPrefix() const } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/RowIterator.cpp b/Data/src/RowIterator.cpp index ff25e1d735..a638d1a275 100644 --- a/Data/src/RowIterator.cpp +++ b/Data/src/RowIterator.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { const std::size_t RowIterator::POSITION_END = std::numeric_limits::max(); @@ -220,4 +219,4 @@ RowIterator RowIterator::operator - (std::size_t diff) const } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/SQLChannel.cpp b/Data/src/SQLChannel.cpp index 9ec60e4406..9159c57904 100644 --- a/Data/src/SQLChannel.cpp +++ b/Data/src/SQLChannel.cpp @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { using namespace Keywords; @@ -750,4 +749,4 @@ void SQLChannel::registerChannel() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Session.cpp b/Data/src/Session.cpp index fc47f297c6..057d2c7984 100644 --- a/Data/src/Session.cpp +++ b/Data/src/Session.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { Session::Session(Poco::AutoPtr pImpl): @@ -129,4 +128,4 @@ void Session::rollback() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/SessionFactory.cpp b/Data/src/SessionFactory.cpp index 6dfc3a54a8..e0313b6acb 100644 --- a/Data/src/SessionFactory.cpp +++ b/Data/src/SessionFactory.cpp @@ -17,8 +17,7 @@ #include "Poco/String.h" -namespace Poco { -namespace Data { +namespace Poco::Data { SessionFactory::SessionFactory() @@ -90,4 +89,4 @@ SessionFactory::SessionInfo::SessionInfo(Connector* pSI): } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/SessionImpl.cpp b/Data/src/SessionImpl.cpp index 2fa2febf76..50f75e08b9 100644 --- a/Data/src/SessionImpl.cpp +++ b/Data/src/SessionImpl.cpp @@ -16,8 +16,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Data { +namespace Poco::Data { SessionImpl::SessionImpl(const std::string& connectionString, std::size_t loginTimeout): @@ -56,4 +55,4 @@ bool SessionImpl::isGood() const } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/SessionPool.cpp b/Data/src/SessionPool.cpp index f29e4fe8ac..dec2890e0c 100644 --- a/Data/src/SessionPool.cpp +++ b/Data/src/SessionPool.cpp @@ -18,8 +18,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { SessionPool::SessionPool(const std::string& connector, const std::string& connectionString, int minSessions, int maxSessions, int idleTime, int connTimeout): @@ -342,4 +341,4 @@ void SessionPool::closeAll(SessionList& sessionList) } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/SessionPoolContainer.cpp b/Data/src/SessionPoolContainer.cpp index c4a48a313e..d4cd49c4a9 100644 --- a/Data/src/SessionPoolContainer.cpp +++ b/Data/src/SessionPoolContainer.cpp @@ -24,8 +24,7 @@ using Poco::FastMutex; -namespace Poco { -namespace Data { +namespace Poco::Data { SessionPoolContainer::SessionPoolContainer() @@ -119,4 +118,4 @@ void SessionPoolContainer::shutdown() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/SimpleRowFormatter.cpp b/Data/src/SimpleRowFormatter.cpp index 00cc53bdd5..61bfcf18c2 100644 --- a/Data/src/SimpleRowFormatter.cpp +++ b/Data/src/SimpleRowFormatter.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { SimpleRowFormatter::SimpleRowFormatter(std::streamsize columnWidth, std::streamsize spacing): @@ -110,4 +109,4 @@ std::string& SimpleRowFormatter::formatValues(const ValueVec& vals, std::string& } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Statement.cpp b/Data/src/Statement.cpp index 2b71cb664c..393313ca1c 100644 --- a/Data/src/Statement.cpp +++ b/Data/src/Statement.cpp @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { Statement::Statement(StatementImpl::Ptr pImpl): @@ -592,4 +591,4 @@ Session Statement::session() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/StatementCreator.cpp b/Data/src/StatementCreator.cpp index 16a2934a22..d1395e54c4 100644 --- a/Data/src/StatementCreator.cpp +++ b/Data/src/StatementCreator.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Data { +namespace Poco::Data { StatementCreator::StatementCreator() @@ -65,4 +64,4 @@ StatementCreator::~StatementCreator() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/StatementImpl.cpp b/Data/src/StatementImpl.cpp index 138db700c6..a423a3eeba 100644 --- a/Data/src/StatementImpl.cpp +++ b/Data/src/StatementImpl.cpp @@ -29,8 +29,7 @@ using Poco::icompare; -namespace Poco { -namespace Data { +namespace Poco::Data { using namespace Keywords; @@ -502,4 +501,4 @@ void StatementImpl::formatSQL(std::vector& arguments) } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Time.cpp b/Data/src/Time.cpp index 9030f15743..222bdca4af 100644 --- a/Data/src/Time.cpp +++ b/Data/src/Time.cpp @@ -22,8 +22,7 @@ using Poco::DateTime; using Poco::Dynamic::Var; -namespace Poco { -namespace Data { +namespace Poco::Data { Time::Time() @@ -100,14 +99,13 @@ Time& Time::operator = (const Var& var) } -} } // namespace Poco::Data +} // namespace Poco::Data #ifdef __GNUC__ // only needed for g++ (see comment in Time::operator = above) -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { using Poco::Data::Time; @@ -133,7 +131,7 @@ Var::operator Time () const } -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // __GNUC__ diff --git a/Data/src/Transaction.cpp b/Data/src/Transaction.cpp index 81157a3c9b..f50aedd04a 100644 --- a/Data/src/Transaction.cpp +++ b/Data/src/Transaction.cpp @@ -16,8 +16,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Data { +namespace Poco::Data { Transaction::Transaction(Poco::Data::Session& rSession, Poco::Logger* pLogger): @@ -128,4 +127,4 @@ void Transaction::rollback() } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/src/Transcoder.cpp b/Data/src/Transcoder.cpp index dec6934888..1160c9f30c 100644 --- a/Data/src/Transcoder.cpp +++ b/Data/src/Transcoder.cpp @@ -15,8 +15,7 @@ #include "Poco/Data/Transcoder.h" -namespace Poco { -namespace Data { +namespace Poco::Data { Transcoder::Transcoder(Poco::TextEncoding::Ptr pFromEncoding, @@ -73,4 +72,4 @@ void Transcoder::reverseTranscode(const std::string& from, std::string& to) } -} } // namespace Poco::Data +} // namespace Poco::Data diff --git a/Data/testsuite/src/Binder.cpp b/Data/testsuite/src/Binder.cpp index dd6db58e9e..23a6b6727b 100644 --- a/Data/testsuite/src/Binder.cpp +++ b/Data/testsuite/src/Binder.cpp @@ -13,9 +13,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { Binder::Binder() @@ -155,4 +153,4 @@ void Binder::reset() } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test diff --git a/Data/testsuite/src/Binder.h b/Data/testsuite/src/Binder.h index 81f63779c8..92c1a806b0 100644 --- a/Data/testsuite/src/Binder.h +++ b/Data/testsuite/src/Binder.h @@ -17,9 +17,7 @@ #include "Poco/Data/AbstractBinder.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { class Binder: public Poco::Data::AbstractBinder @@ -110,7 +108,7 @@ class Binder: public Poco::Data::AbstractBinder }; -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test #endif // Data_Test_Binder_INCLUDED diff --git a/Data/testsuite/src/Connector.cpp b/Data/testsuite/src/Connector.cpp index e9aaa73ae9..db396767aa 100644 --- a/Data/testsuite/src/Connector.cpp +++ b/Data/testsuite/src/Connector.cpp @@ -13,9 +13,7 @@ #include "Poco/Data/SessionFactory.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { const std::string Connector::KEY("test"); @@ -50,4 +48,4 @@ void Connector::removeFromFactory() } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test diff --git a/Data/testsuite/src/Connector.h b/Data/testsuite/src/Connector.h index cbad33b597..8e0620056a 100644 --- a/Data/testsuite/src/Connector.h +++ b/Data/testsuite/src/Connector.h @@ -17,9 +17,7 @@ #include "Poco/Data/Connector.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { class Connector: public Poco::Data::Connector @@ -59,7 +57,7 @@ inline const std::string& Connector::name() const } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test #endif // Data_Test_Connector_INCLUDED diff --git a/Data/testsuite/src/Extractor.cpp b/Data/testsuite/src/Extractor.cpp index c88952f066..fb266414f2 100644 --- a/Data/testsuite/src/Extractor.cpp +++ b/Data/testsuite/src/Extractor.cpp @@ -13,9 +13,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { Extractor::Extractor(Poco::TextEncoding::Ptr pDBEncoding): @@ -820,4 +818,4 @@ bool Extractor::extract(std::size_t pos, Poco::Nullable& val } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test diff --git a/Data/testsuite/src/Extractor.h b/Data/testsuite/src/Extractor.h index d5941fbc08..597d1080f5 100644 --- a/Data/testsuite/src/Extractor.h +++ b/Data/testsuite/src/Extractor.h @@ -17,9 +17,7 @@ #include "Poco/Data/AbstractExtractor.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { class Extractor: public Poco::Data::AbstractExtractor @@ -445,7 +443,7 @@ inline bool Extractor::isNull(std::size_t col, std::size_t row) } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test #endif // Data_Test_Extractor_INCLUDED diff --git a/Data/testsuite/src/Preparator.cpp b/Data/testsuite/src/Preparator.cpp index 4aaf04ba08..57d075b90d 100644 --- a/Data/testsuite/src/Preparator.cpp +++ b/Data/testsuite/src/Preparator.cpp @@ -13,9 +13,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { Preparator::Preparator() @@ -150,4 +148,4 @@ void Preparator::prepare(std::size_t pos, const Poco::Dynamic::Var&) } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test diff --git a/Data/testsuite/src/Preparator.h b/Data/testsuite/src/Preparator.h index a36502439b..b8d9744485 100644 --- a/Data/testsuite/src/Preparator.h +++ b/Data/testsuite/src/Preparator.h @@ -18,9 +18,7 @@ #include "Poco/Any.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { class Preparator: public Poco::Data::AbstractPreparator @@ -109,7 +107,7 @@ class Preparator: public Poco::Data::AbstractPreparator }; -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test #endif // Data_Test_Preparator_INCLUDED diff --git a/Data/testsuite/src/SQLParserTest.cpp b/Data/testsuite/src/SQLParserTest.cpp index 49416ad200..b4df010c5d 100644 --- a/Data/testsuite/src/SQLParserTest.cpp +++ b/Data/testsuite/src/SQLParserTest.cpp @@ -18,12 +18,11 @@ #include "SQLParser.h" -namespace Poco { -namespace Data { +namespace Poco::Data { namespace Parser = hsql; // namespace Poco::Data::Parser -}} +} // namespace Poco::Data using namespace Poco::Data::Parser; diff --git a/Data/testsuite/src/SessionImpl.cpp b/Data/testsuite/src/SessionImpl.cpp index e0f11554ec..ca77224917 100644 --- a/Data/testsuite/src/SessionImpl.cpp +++ b/Data/testsuite/src/SessionImpl.cpp @@ -13,9 +13,7 @@ #include "Connector.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { SessionImpl::SessionImpl(const std::string& init, std::size_t timeout): @@ -182,4 +180,4 @@ Poco::Any SessionImpl::getP(const std::string& name) const } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test diff --git a/Data/testsuite/src/SessionImpl.h b/Data/testsuite/src/SessionImpl.h index a0d695533e..8a5310dd53 100644 --- a/Data/testsuite/src/SessionImpl.h +++ b/Data/testsuite/src/SessionImpl.h @@ -20,9 +20,7 @@ #include "Binder.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { class SessionImpl: public Poco::Data::AbstractSessionImpl @@ -112,7 +110,7 @@ class SessionImpl: public Poco::Data::AbstractSessionImpl }; -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test #endif // Data_Test_SessionImpl_INCLUDED diff --git a/Data/testsuite/src/TestStatementImpl.cpp b/Data/testsuite/src/TestStatementImpl.cpp index e681752ba3..838ca3894e 100644 --- a/Data/testsuite/src/TestStatementImpl.cpp +++ b/Data/testsuite/src/TestStatementImpl.cpp @@ -12,9 +12,7 @@ #include "SessionImpl.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { TestStatementImpl::TestStatementImpl(SessionImpl& rSession, bool throwOnHasNext): @@ -101,4 +99,4 @@ std::size_t TestStatementImpl::next() } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test diff --git a/Data/testsuite/src/TestStatementImpl.h b/Data/testsuite/src/TestStatementImpl.h index c9a373f2d3..f2e96497ed 100644 --- a/Data/testsuite/src/TestStatementImpl.h +++ b/Data/testsuite/src/TestStatementImpl.h @@ -22,9 +22,7 @@ #include "Preparator.h" -namespace Poco { -namespace Data { -namespace Test { +namespace Poco::Data::Test { class SessionImpl; @@ -112,7 +110,7 @@ inline bool TestStatementImpl::canCompile() const } -} } } // namespace Poco::Data::Test +} // namespace Poco::Data::Test #endif // Data_Test_TestStatementImpl_INCLUDED diff --git a/Foundation/include/Poco/Dynamic/Pair.h b/Foundation/include/Poco/Dynamic/Pair.h index 822cba5ea6..ffd401b5fd 100644 --- a/Foundation/include/Poco/Dynamic/Pair.h +++ b/Foundation/include/Poco/Dynamic/Pair.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template @@ -394,10 +393,7 @@ class VarHolderImpl>: public VarHolder }; -} // namespace Dynamic - - -} // namespace Poco +} // namespace Poco::Dynamic #endif // Foundation_Pair_INCLUDED diff --git a/Foundation/include/Poco/Dynamic/Struct.h b/Foundation/include/Poco/Dynamic/Struct.h index 394de4c132..e64b54c7c1 100644 --- a/Foundation/include/Poco/Dynamic/Struct.h +++ b/Foundation/include/Poco/Dynamic/Struct.h @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template @@ -965,7 +964,10 @@ class VarHolderImpl, Poco::OrderedSet; diff --git a/Foundation/include/Poco/Dynamic/Var.h b/Foundation/include/Poco/Dynamic/Var.h index e4e0dd55f1..a5c9363baa 100644 --- a/Foundation/include/Poco/Dynamic/Var.h +++ b/Foundation/include/Poco/Dynamic/Var.h @@ -31,8 +31,7 @@ #include -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template @@ -2285,7 +2284,10 @@ inline bool operator >= (const unsigned long& other, const Var& da) #endif // POCO_INT64_IS_LONG -} // namespace Dynamic +} // namespace Poco::Dynamic + + +namespace Poco { using DynamicAny POCO_DEPRECATED("Replace with Poco::Dynamic::Var") = Dynamic::Var; diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h index 5dc2c55008..b454c33bf0 100644 --- a/Foundation/include/Poco/Dynamic/VarHolder.h +++ b/Foundation/include/Poco/Dynamic/VarHolder.h @@ -56,8 +56,7 @@ poco_src_loc)) -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { class Var; @@ -4649,7 +4648,7 @@ using List = std::list; using Array = Vector; -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // Foundation_VarHolder_INCLUDED diff --git a/Foundation/include/Poco/Dynamic/VarIterator.h b/Foundation/include/Poco/Dynamic/VarIterator.h index 466451e9eb..d62d62f1c3 100644 --- a/Foundation/include/Poco/Dynamic/VarIterator.h +++ b/Foundation/include/Poco/Dynamic/VarIterator.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { class Var; @@ -174,7 +173,7 @@ inline bool VarIterator::operator >= (const VarIterator& other) const } -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic namespace std diff --git a/Foundation/include/Poco/Dynamic/VarVisitor.h b/Foundation/include/Poco/Dynamic/VarVisitor.h index b3b3d1ce2d..458c1b4bcd 100644 --- a/Foundation/include/Poco/Dynamic/VarVisitor.h +++ b/Foundation/include/Poco/Dynamic/VarVisitor.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Details { +namespace Poco::Details { #ifndef POCO_DOC @@ -61,10 +60,10 @@ using Handler = std::function; #endif // POCO_DOC -} // Details +} // namespace Poco::Details -namespace Dynamic { +namespace Poco::Dynamic { class Foundation_API Visitor @@ -110,7 +109,7 @@ class Foundation_API Visitor }; -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // Foundation_VarVisitor_INCLUDED diff --git a/Foundation/include/Poco/FunctionDelegate.h b/Foundation/include/Poco/FunctionDelegate.h index 69ca7369ad..2e0f9ea639 100644 --- a/Foundation/include/Poco/FunctionDelegate.h +++ b/Foundation/include/Poco/FunctionDelegate.h @@ -24,10 +24,7 @@ #include -namespace Poco { - - -namespace Detail { +namespace Poco::Detail { /// Helper to select the correct function pointer type based on template parameters. template @@ -69,7 +66,10 @@ struct FunctionDelegateNotifyType using Type = void (*)(); }; -} // namespace Detail +} // namespace Poco::Detail + + +namespace Poco { template diff --git a/Foundation/src/Var.cpp b/Foundation/src/Var.cpp index 0aa7b7ecd7..0c2db3bc80 100644 --- a/Foundation/src/Var.cpp +++ b/Foundation/src/Var.cpp @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { Var::Var() @@ -629,4 +628,4 @@ Var& Var::structIndexOperator(VarHolderImpl>* pStr, int n) const } */ -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic diff --git a/Foundation/src/VarHolder.cpp b/Foundation/src/VarHolder.cpp index b84dbe7698..082231768f 100644 --- a/Foundation/src/VarHolder.cpp +++ b/Foundation/src/VarHolder.cpp @@ -18,8 +18,7 @@ #include "Poco/JSONString.h" -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { #if defined(POCO_OS_FAMILY_WINDOWS) && defined(Foundation_EXPORTS) @@ -114,4 +113,4 @@ void appendJSONValue(std::string& val, const Var& any, bool wrap) } // namespace Impl -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic diff --git a/Foundation/src/VarIterator.cpp b/Foundation/src/VarIterator.cpp index de03155679..3a9703dc9c 100644 --- a/Foundation/src/VarIterator.cpp +++ b/Foundation/src/VarIterator.cpp @@ -20,8 +20,7 @@ #include -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { const std::size_t VarIterator::POSITION_END = std::numeric_limits::max(); @@ -179,4 +178,4 @@ VarIterator VarIterator::operator - (std::size_t diff) const } -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic diff --git a/Foundation/src/VarVisitor.cpp b/Foundation/src/VarVisitor.cpp index 1c23ea2d84..758233ad25 100644 --- a/Foundation/src/VarVisitor.cpp +++ b/Foundation/src/VarVisitor.cpp @@ -14,8 +14,7 @@ #include "Poco/Dynamic/VarVisitor.h" -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { bool Visitor::visit(const Var &x) const { @@ -29,4 +28,4 @@ bool Visitor::visit(const Var &x) const return wasHandled; } -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic diff --git a/JSON/include/Poco/JSON/Array.h b/JSON/include/Poco/JSON/Array.h index e7daf00b2c..4050969cd4 100644 --- a/JSON/include/Poco/JSON/Array.h +++ b/JSON/include/Poco/JSON/Array.h @@ -25,13 +25,11 @@ #include -namespace Poco { - -namespace JSON { +namespace Poco::JSON { class JSON_API Array; -} +} // namespace Poco::JSON #if defined(POCO_OS_FAMILY_WINDOWS) && defined(JSON_EXPORTS) @@ -42,7 +40,7 @@ extern template class Poco::SharedPtr; extern template class JSON_API Poco::SharedPtr; #endif -namespace JSON { +namespace Poco::JSON { class Object; @@ -325,11 +323,10 @@ inline void Array::remove(unsigned int index) } -} } // namespace Poco::JSON +} // namespace Poco::JSON -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template <> @@ -596,7 +593,7 @@ class VarHolderImpl: public VarHolder }; -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // JSON_Array_INCLUDED diff --git a/JSON/include/Poco/JSON/Handler.h b/JSON/include/Poco/JSON/Handler.h index d756f0e32b..c4b5035e7b 100644 --- a/JSON/include/Poco/JSON/Handler.h +++ b/JSON/include/Poco/JSON/Handler.h @@ -24,8 +24,7 @@ #include "Poco/Dynamic/Struct.h" -namespace Poco { -namespace JSON { +namespace Poco::JSON { class JSON_API Handler @@ -100,7 +99,7 @@ class JSON_API Handler }; -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_Handler_INCLUDED diff --git a/JSON/include/Poco/JSON/JSONException.h b/JSON/include/Poco/JSON/JSONException.h index 058d36f0ae..be721807ee 100644 --- a/JSON/include/Poco/JSON/JSONException.h +++ b/JSON/include/Poco/JSON/JSONException.h @@ -22,14 +22,13 @@ #include "Poco/Exception.h" -namespace Poco { -namespace JSON { +namespace Poco::JSON { POCO_DECLARE_EXCEPTION(JSON_API, JSONException, Poco::Exception) -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_JSONException_INCLUDED diff --git a/JSON/include/Poco/JSON/Object.h b/JSON/include/Poco/JSON/Object.h index bbd45f5512..4d239def18 100644 --- a/JSON/include/Poco/JSON/Object.h +++ b/JSON/include/Poco/JSON/Object.h @@ -33,13 +33,11 @@ #include -namespace Poco { - -namespace JSON { +namespace Poco::JSON { class JSON_API Object; -} +} // namespace Poco::JSON #if defined(POCO_OS_FAMILY_WINDOWS) && defined(JSON_EXPORTS) // Explicitly instatiated shared pointer in JSON library @@ -49,7 +47,7 @@ extern template class Poco::SharedPtr; extern template class JSON_API Poco::SharedPtr; #endif -namespace JSON { +namespace Poco::JSON { class JSON_API Object /// Represents a JSON object. Object provides a representation based on @@ -516,11 +514,10 @@ inline const Dynamic::Var& Object::getValue(KeyList::const_iterator& it) const } -} } // namespace Poco::JSON +} // namespace Poco::JSON -namespace Poco { -namespace Dynamic { +namespace Poco::Dynamic { template <> @@ -803,7 +800,7 @@ class VarHolderImpl: public VarHolder }; -} } // namespace Poco::Dynamic +} // namespace Poco::Dynamic #endif // JSON_Object_INCLUDED diff --git a/JSON/include/Poco/JSON/ParseHandler.h b/JSON/include/Poco/JSON/ParseHandler.h index 74c9ba9cea..0eb5eaa8f3 100644 --- a/JSON/include/Poco/JSON/ParseHandler.h +++ b/JSON/include/Poco/JSON/ParseHandler.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace JSON { +namespace Poco::JSON { class JSON_API ParseHandler: public Handler @@ -163,7 +162,7 @@ inline void ParseHandler::null() } -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_ParseHandler_INCLUDED diff --git a/JSON/include/Poco/JSON/Parser.h b/JSON/include/Poco/JSON/Parser.h index 6a175990e8..de78f65afc 100644 --- a/JSON/include/Poco/JSON/Parser.h +++ b/JSON/include/Poco/JSON/Parser.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace JSON { +namespace Poco::JSON { class JSON_API Parser: private ParserImpl @@ -205,7 +204,7 @@ inline Dynamic::Var Parser::parse(std::istream& in) } -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_JSONParser_INCLUDED diff --git a/JSON/include/Poco/JSON/ParserImpl.h b/JSON/include/Poco/JSON/ParserImpl.h index d9349126bb..d1b7cbf09c 100644 --- a/JSON/include/Poco/JSON/ParserImpl.h +++ b/JSON/include/Poco/JSON/ParserImpl.h @@ -27,8 +27,7 @@ struct json_stream; -namespace Poco { -namespace JSON { +namespace Poco::JSON { class JSON_API ParserImpl @@ -183,7 +182,7 @@ inline Dynamic::Var ParserImpl::asVarImpl() const } -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_JSONParserImpl_INCLUDED diff --git a/JSON/include/Poco/JSON/PrintHandler.h b/JSON/include/Poco/JSON/PrintHandler.h index 2bee734bd6..ffe846ab8b 100644 --- a/JSON/include/Poco/JSON/PrintHandler.h +++ b/JSON/include/Poco/JSON/PrintHandler.h @@ -23,8 +23,7 @@ #include "Poco/JSONString.h" -namespace Poco { -namespace JSON { +namespace Poco::JSON { class JSON_API PrintHandler: public Handler @@ -133,7 +132,7 @@ inline bool PrintHandler::array() const } -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_PrintHandler_INCLUDED diff --git a/JSON/include/Poco/JSON/Query.h b/JSON/include/Poco/JSON/Query.h index 303bbec439..3febbc0989 100644 --- a/JSON/include/Poco/JSON/Query.h +++ b/JSON/include/Poco/JSON/Query.h @@ -23,8 +23,7 @@ #include "Poco/JSON/Array.h" -namespace Poco { -namespace JSON { +namespace Poco::JSON { class JSON_API Query @@ -119,7 +118,7 @@ class JSON_API Query }; -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_JSONQuery_INCLUDED diff --git a/JSON/include/Poco/JSON/Stringifier.h b/JSON/include/Poco/JSON/Stringifier.h index 8e3303becf..6c73e0dcef 100644 --- a/JSON/include/Poco/JSON/Stringifier.h +++ b/JSON/include/Poco/JSON/Stringifier.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace JSON { +namespace Poco::JSON { class JSON_API Stringifier @@ -67,7 +66,7 @@ inline void Stringifier::condense(const Dynamic::Var& any, std::ostream& out, in } -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_JSONStringifier_INCLUDED diff --git a/JSON/include/Poco/JSON/Template.h b/JSON/include/Poco/JSON/Template.h index 01ecd7ebfe..eef88fde86 100644 --- a/JSON/include/Poco/JSON/Template.h +++ b/JSON/include/Poco/JSON/Template.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace JSON { +namespace Poco::JSON { class MultiPart; @@ -145,7 +144,7 @@ inline Timestamp Template::parseTime() const } -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_JSONTemplate_INCLUDED diff --git a/JSON/include/Poco/JSON/TemplateCache.h b/JSON/include/Poco/JSON/TemplateCache.h index 4fe29195f7..84a02c8a9f 100644 --- a/JSON/include/Poco/JSON/TemplateCache.h +++ b/JSON/include/Poco/JSON/TemplateCache.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace JSON { +namespace Poco::JSON { class JSON_API TemplateCache @@ -98,7 +97,7 @@ inline void TemplateCache::setLogger(Logger& logger) } -} } // namespace Poco::JSON +} // namespace Poco::JSON #endif // JSON_JSONTemplateCache_INCLUDED diff --git a/JSON/src/Array.cpp b/JSON/src/Array.cpp index 8ba2296803..c435187caa 100644 --- a/JSON/src/Array.cpp +++ b/JSON/src/Array.cpp @@ -30,8 +30,7 @@ template class Poco::SharedPtr; #endif -namespace Poco { -namespace JSON { +namespace Poco::JSON { Array::Array(int options): @@ -269,4 +268,4 @@ void Array::clear() } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/Handler.cpp b/JSON/src/Handler.cpp index 0406ccf947..ae7d5a5b18 100644 --- a/JSON/src/Handler.cpp +++ b/JSON/src/Handler.cpp @@ -15,8 +15,7 @@ #include "Poco/JSON/Handler.h" -namespace Poco { -namespace JSON { +namespace Poco::JSON { Handler::Handler() = default; @@ -37,4 +36,4 @@ Poco::DynamicStruct Handler::asStruct() const } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/JSONException.cpp b/JSON/src/JSONException.cpp index 0ab2a13120..eb83064aa1 100644 --- a/JSON/src/JSONException.cpp +++ b/JSON/src/JSONException.cpp @@ -16,11 +16,10 @@ #include -namespace Poco { -namespace JSON { +namespace Poco::JSON { POCO_IMPLEMENT_EXCEPTION(JSONException, Exception, "JSON Exception") -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/Object.cpp b/JSON/src/Object.cpp index 43e6ff82c4..bca36d5293 100644 --- a/JSON/src/Object.cpp +++ b/JSON/src/Object.cpp @@ -28,9 +28,7 @@ template class JSON_API Poco::SharedPtr; template class Poco::SharedPtr; #endif -namespace Poco { - -namespace JSON { +namespace Poco::JSON { Object::Object(int options): @@ -361,4 +359,4 @@ void Object::clear() } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/ParseHandler.cpp b/JSON/src/ParseHandler.cpp index 345e4853bf..f11cd33e55 100644 --- a/JSON/src/ParseHandler.cpp +++ b/JSON/src/ParseHandler.cpp @@ -20,8 +20,7 @@ using Poco::Dynamic::Var; -namespace Poco { -namespace JSON { +namespace Poco::JSON { ParseHandler::ParseHandler(bool preserveObjectOrder) : Handler(), @@ -138,4 +137,4 @@ void ParseHandler::setValue(const Var& value) } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/Parser.cpp b/JSON/src/Parser.cpp index 1dec9e823c..3b31eaedbb 100644 --- a/JSON/src/Parser.cpp +++ b/JSON/src/Parser.cpp @@ -18,8 +18,7 @@ #include -namespace Poco { -namespace JSON { +namespace Poco::JSON { Parser::Parser(const Handler::Ptr& pHandler): @@ -37,4 +36,4 @@ void Parser::setHandler(const Handler::Ptr& pHandler) } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/ParserImpl.cpp b/JSON/src/ParserImpl.cpp index 8a04aa70a1..4639487efb 100644 --- a/JSON/src/ParserImpl.cpp +++ b/JSON/src/ParserImpl.cpp @@ -27,8 +27,7 @@ using json_stream = struct json_stream; -namespace Poco { -namespace JSON { +namespace Poco::JSON { extern "C" @@ -303,4 +302,4 @@ bool ParserImpl::checkError() } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/PrintHandler.cpp b/JSON/src/PrintHandler.cpp index b17727677a..a5176ab4fe 100644 --- a/JSON/src/PrintHandler.cpp +++ b/JSON/src/PrintHandler.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace JSON { +namespace Poco::JSON { PrintHandler::PrintHandler(unsigned indent, int options): @@ -210,4 +209,4 @@ void PrintHandler::arrayValue() } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/Query.cpp b/JSON/src/Query.cpp index 03e05095a6..0bd6f0f4eb 100644 --- a/JSON/src/Query.cpp +++ b/JSON/src/Query.cpp @@ -22,8 +22,7 @@ using Poco::Dynamic::Var; -namespace Poco { -namespace JSON { +namespace Poco::JSON { Query::Query(const Var& source): _source(source) @@ -171,4 +170,4 @@ Var Query::find(const std::string& path) const } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/Stringifier.cpp b/JSON/src/Stringifier.cpp index 0a7a8f8a23..8bb7ddf8b1 100644 --- a/JSON/src/Stringifier.cpp +++ b/JSON/src/Stringifier.cpp @@ -20,8 +20,7 @@ using Poco::Dynamic::Var; -namespace Poco { -namespace JSON { +namespace Poco::JSON { void Stringifier::stringify(const Var& any, std::ostream& out, unsigned int indent, int step, int options) @@ -89,4 +88,4 @@ void Stringifier::formatString(const std::string& value, std::ostream& out, int } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/Template.cpp b/JSON/src/Template.cpp index c12559b5d9..64a6823eca 100644 --- a/JSON/src/Template.cpp +++ b/JSON/src/Template.cpp @@ -22,8 +22,7 @@ using Poco::Dynamic::Var; -namespace Poco { -namespace JSON { +namespace Poco::JSON { POCO_IMPLEMENT_EXCEPTION(JSONTemplateException, Exception, "Template Exception") @@ -674,4 +673,4 @@ void Template::render(const Var& data, std::ostream& out) const } -} } // namespace Poco::JSON +} // namespace Poco::JSON diff --git a/JSON/src/TemplateCache.cpp b/JSON/src/TemplateCache.cpp index 5e0ad03abc..cda509bdf4 100644 --- a/JSON/src/TemplateCache.cpp +++ b/JSON/src/TemplateCache.cpp @@ -16,8 +16,7 @@ #include "Poco/JSON/TemplateCache.h" -namespace Poco { -namespace JSON { +namespace Poco::JSON { TemplateCache* TemplateCache::_pInstance = nullptr; @@ -154,4 +153,4 @@ Path TemplateCache::resolvePath(const Path& path) const } -} } // Poco::JSON +} // namespace Poco::JSON diff --git a/JWT/include/Poco/JWT/JWTException.h b/JWT/include/Poco/JWT/JWTException.h index ace75a8ea3..d94117fd0f 100644 --- a/JWT/include/Poco/JWT/JWTException.h +++ b/JWT/include/Poco/JWT/JWTException.h @@ -22,8 +22,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace JWT { +namespace Poco::JWT { POCO_DECLARE_EXCEPTION(JWT_API, JWTException, Poco::Exception) @@ -35,7 +34,7 @@ POCO_DECLARE_EXCEPTION(JWT_API, SignatureVerificationException, SignatureExcepti POCO_DECLARE_EXCEPTION(JWT_API, SignatureGenerationException, SignatureException) -} } // namespace Poco::JWT +} // namespace Poco::JWT #endif // JWT_JWTException_INCLUDED diff --git a/JWT/include/Poco/JWT/Serializer.h b/JWT/include/Poco/JWT/Serializer.h index f3b76204f3..3e29697299 100644 --- a/JWT/include/Poco/JWT/Serializer.h +++ b/JWT/include/Poco/JWT/Serializer.h @@ -22,8 +22,7 @@ #include "Poco/JSON/Object.h" -namespace Poco { -namespace JWT { +namespace Poco::JWT { class JWT_API Serializer @@ -47,7 +46,7 @@ class JWT_API Serializer }; -} } // namespace Poco::JWT +} // namespace Poco::JWT #endif // JWT_Serializer_INCLUDED diff --git a/JWT/include/Poco/JWT/Signer.h b/JWT/include/Poco/JWT/Signer.h index 0de5967b59..358bcb3634 100644 --- a/JWT/include/Poco/JWT/Signer.h +++ b/JWT/include/Poco/JWT/Signer.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace JWT { +namespace Poco::JWT { class JWT_API Signer @@ -190,7 +189,7 @@ inline Poco::SharedPtr Signer::getECKey() const } -} } // namespace Poco::JWT +} // namespace Poco::JWT #endif // JWT_Signer_INCLUDED diff --git a/JWT/include/Poco/JWT/Token.h b/JWT/include/Poco/JWT/Token.h index 44c7fedfd1..444f9a8ff5 100644 --- a/JWT/include/Poco/JWT/Token.h +++ b/JWT/include/Poco/JWT/Token.h @@ -23,8 +23,7 @@ #include "Poco/Timestamp.h" -namespace Poco { -namespace JWT { +namespace Poco::JWT { class JWT_API Token @@ -336,7 +335,7 @@ inline std::string Token::getContentType() const } -} } // namespace Poco::JWT +} // namespace Poco::JWT #endif // JWT_Token_INCLUDED diff --git a/JWT/src/JWTException.cpp b/JWT/src/JWTException.cpp index 9de0df73fe..feaa354034 100644 --- a/JWT/src/JWTException.cpp +++ b/JWT/src/JWTException.cpp @@ -19,8 +19,7 @@ using Poco::Exception; -namespace Poco { -namespace JWT { +namespace Poco::JWT { POCO_IMPLEMENT_EXCEPTION(JWTException, Exception, "JWT Exception") @@ -32,4 +31,4 @@ POCO_IMPLEMENT_EXCEPTION(SignatureVerificationException, SignatureException, "JW POCO_IMPLEMENT_EXCEPTION(SignatureGenerationException, SignatureException, "JWT signature generation failed") -} } // namespace Poco::JWT +} // namespace Poco::JWT diff --git a/JWT/src/Serializer.cpp b/JWT/src/Serializer.cpp index cc2972184c..4ec450a1cf 100644 --- a/JWT/src/Serializer.cpp +++ b/JWT/src/Serializer.cpp @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace JWT { +namespace Poco::JWT { std::string Serializer::serialize(const Poco::JSON::Object& object) @@ -78,4 +77,4 @@ std::vector Serializer::split(const std::string& token) } -} } // namespace Poco::JWT +} // namespace Poco::JWT diff --git a/JWT/src/Signer.cpp b/JWT/src/Signer.cpp index 817d6524c1..404ff41d07 100644 --- a/JWT/src/Signer.cpp +++ b/JWT/src/Signer.cpp @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace JWT { +namespace Poco::JWT { // @@ -513,4 +512,4 @@ Poco::DigestEngine::Digest Signer::decode(const std::string& signature) } -} } // namespace Poco::JWT +} // namespace Poco::JWT diff --git a/JWT/src/Token.cpp b/JWT/src/Token.cpp index 2e072d1cd2..d422e86a17 100644 --- a/JWT/src/Token.cpp +++ b/JWT/src/Token.cpp @@ -17,8 +17,7 @@ #include "Poco/JWT/JWTException.h" -namespace Poco { -namespace JWT { +namespace Poco::JWT { const std::string Token::CLAIM_ISSUER("iss"); @@ -195,4 +194,4 @@ void Token::sign(const std::string& signature) } -} } // namespace Poco::JWT +} // namespace Poco::JWT diff --git a/MongoDB/include/Poco/MongoDB/Array.h b/MongoDB/include/Poco/MongoDB/Array.h index 8f4712240c..5cf19ecbd6 100644 --- a/MongoDB/include/Poco/MongoDB/Array.h +++ b/MongoDB/include/Poco/MongoDB/Array.h @@ -23,8 +23,7 @@ #include "Poco/MongoDB/Document.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API Array: public Document @@ -129,7 +128,7 @@ inline void BSONWriter::write(const Array::Ptr& from) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_Array_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/BSONReader.h b/MongoDB/include/Poco/MongoDB/BSONReader.h index 187bf8e115..67ce7b08b7 100644 --- a/MongoDB/include/Poco/MongoDB/BSONReader.h +++ b/MongoDB/include/Poco/MongoDB/BSONReader.h @@ -22,8 +22,7 @@ #include "Poco/BinaryReader.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API BSONReader @@ -78,7 +77,7 @@ inline std::string BSONReader::readCString() } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_BSONReader_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/BSONWriter.h b/MongoDB/include/Poco/MongoDB/BSONWriter.h index 5b28f8b239..8cd924c61c 100644 --- a/MongoDB/include/Poco/MongoDB/BSONWriter.h +++ b/MongoDB/include/Poco/MongoDB/BSONWriter.h @@ -22,8 +22,7 @@ #include "Poco/BinaryWriter.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API BSONWriter @@ -68,7 +67,7 @@ inline void BSONWriter::writeCString(const std::string& value) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_BSONWriter_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/Binary.h b/MongoDB/include/Poco/MongoDB/Binary.h index 1eadefd269..a3ada593a9 100644 --- a/MongoDB/include/Poco/MongoDB/Binary.h +++ b/MongoDB/include/Poco/MongoDB/Binary.h @@ -24,8 +24,7 @@ #include "Poco/UUID.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API Binary @@ -173,7 +172,7 @@ inline void BSONWriter::write(const Binary::Ptr& from) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_Binary_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/Connection.h b/MongoDB/include/Poco/MongoDB/Connection.h index 045b5cff20..e46075e9c9 100644 --- a/MongoDB/include/Poco/MongoDB/Connection.h +++ b/MongoDB/include/Poco/MongoDB/Connection.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class OpMsgMessage; @@ -175,7 +174,7 @@ inline Net::SocketAddress Connection::address() const } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_Connection_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/Database.h b/MongoDB/include/Poco/MongoDB/Database.h index 96a34f8205..13ba555508 100644 --- a/MongoDB/include/Poco/MongoDB/Database.h +++ b/MongoDB/include/Poco/MongoDB/Database.h @@ -25,8 +25,7 @@ #include "Poco/MongoDB/OpMsgCursor.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API Database @@ -164,7 +163,7 @@ Database::createOpMsgCursor(const std::string& collectionName) const } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_Database_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/Document.h b/MongoDB/include/Poco/MongoDB/Document.h index 04db865b75..0512b846e4 100644 --- a/MongoDB/include/Poco/MongoDB/Document.h +++ b/MongoDB/include/Poco/MongoDB/Document.h @@ -30,8 +30,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class Array; @@ -349,7 +348,7 @@ inline void BSONWriter::write(const Document::Ptr& from) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_Document_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/Element.h b/MongoDB/include/Poco/MongoDB/Element.h index 8f2133c4d6..21faa37c4d 100644 --- a/MongoDB/include/Poco/MongoDB/Element.h +++ b/MongoDB/include/Poco/MongoDB/Element.h @@ -33,8 +33,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API Element @@ -426,7 +425,7 @@ class ConcreteElement: public Element }; -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_Element_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/JavaScriptCode.h b/MongoDB/include/Poco/MongoDB/JavaScriptCode.h index cc162a003e..cf9ee477c0 100644 --- a/MongoDB/include/Poco/MongoDB/JavaScriptCode.h +++ b/MongoDB/include/Poco/MongoDB/JavaScriptCode.h @@ -25,8 +25,7 @@ #include "Poco/SharedPtr.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API JavaScriptCode @@ -100,7 +99,7 @@ inline void BSONWriter::write(const JavaScriptCode::Ptr& fr } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_JavaScriptCode_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/Message.h b/MongoDB/include/Poco/MongoDB/Message.h index 376b50a967..ad8dc4b005 100644 --- a/MongoDB/include/Poco/MongoDB/Message.h +++ b/MongoDB/include/Poco/MongoDB/Message.h @@ -24,8 +24,7 @@ #include "Poco/Types.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API Message @@ -68,7 +67,7 @@ inline void Message::messageLength(Poco::Int32 length) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_Message_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/ObjectId.h b/MongoDB/include/Poco/MongoDB/ObjectId.h index ff089dc328..20bcad9f5c 100644 --- a/MongoDB/include/Poco/MongoDB/ObjectId.h +++ b/MongoDB/include/Poco/MongoDB/ObjectId.h @@ -23,8 +23,7 @@ #include "Poco/Timestamp.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API ObjectId @@ -150,7 +149,7 @@ inline void BSONWriter::write(const ObjectId::Ptr& from) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_ObjectId_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/OpMsgCursor.h b/MongoDB/include/Poco/MongoDB/OpMsgCursor.h index 8e3715248c..432540663c 100644 --- a/MongoDB/include/Poco/MongoDB/OpMsgCursor.h +++ b/MongoDB/include/Poco/MongoDB/OpMsgCursor.h @@ -23,8 +23,7 @@ #include "Poco/MongoDB/OpMsgMessage.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class Connection; @@ -132,7 +131,7 @@ inline Int64 OpMsgCursor::cursorID() const noexcept } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_OpMsgCursor_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/OpMsgMessage.h b/MongoDB/include/Poco/MongoDB/OpMsgMessage.h index 740e654b17..deb3971610 100644 --- a/MongoDB/include/Poco/MongoDB/OpMsgMessage.h +++ b/MongoDB/include/Poco/MongoDB/OpMsgMessage.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API OpMsgMessage: public Message @@ -160,7 +159,7 @@ class MongoDB_API OpMsgMessage: public Message }; -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_OpMsgMessage_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/ReadPreference.h b/MongoDB/include/Poco/MongoDB/ReadPreference.h index c94e48c445..abb813abe3 100644 --- a/MongoDB/include/Poco/MongoDB/ReadPreference.h +++ b/MongoDB/include/Poco/MongoDB/ReadPreference.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class TopologyDescription; // Forward declaration @@ -199,7 +198,7 @@ inline ReadPreference ReadPreference::nearest() } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_ReadPreference_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/RegularExpression.h b/MongoDB/include/Poco/MongoDB/RegularExpression.h index f34a9ec903..14e11c546b 100644 --- a/MongoDB/include/Poco/MongoDB/RegularExpression.h +++ b/MongoDB/include/Poco/MongoDB/RegularExpression.h @@ -23,8 +23,7 @@ #include "Poco/MongoDB/Element.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API RegularExpression @@ -167,7 +166,7 @@ inline void BSONWriter::write(const RegularExpression::P } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_RegularExpression_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/ReplicaSet.h b/MongoDB/include/Poco/MongoDB/ReplicaSet.h index f0d9a47d48..03e4dea5f7 100644 --- a/MongoDB/include/Poco/MongoDB/ReplicaSet.h +++ b/MongoDB/include/Poco/MongoDB/ReplicaSet.h @@ -32,8 +32,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class ReplicaSetURI; @@ -270,7 +269,7 @@ class MongoDB_API ReplicaSet }; -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_ReplicaSet_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/ReplicaSetConnection.h b/MongoDB/include/Poco/MongoDB/ReplicaSetConnection.h index cb091ef5c7..2b046b6834 100644 --- a/MongoDB/include/Poco/MongoDB/ReplicaSetConnection.h +++ b/MongoDB/include/Poco/MongoDB/ReplicaSetConnection.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class OpMsgMessage; @@ -130,7 +129,7 @@ class MongoDB_API ReplicaSetConnection }; -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_ReplicaSetConnection_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/ReplicaSetURI.h b/MongoDB/include/Poco/MongoDB/ReplicaSetURI.h index 3b4e871106..e64fc5d5ba 100644 --- a/MongoDB/include/Poco/MongoDB/ReplicaSetURI.h +++ b/MongoDB/include/Poco/MongoDB/ReplicaSetURI.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API ReplicaSetURI @@ -202,7 +201,7 @@ class MongoDB_API ReplicaSetURI }; -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_ReplicaSetURI_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/ServerDescription.h b/MongoDB/include/Poco/MongoDB/ServerDescription.h index c846fdc5b9..e110db97c2 100644 --- a/MongoDB/include/Poco/MongoDB/ServerDescription.h +++ b/MongoDB/include/Poco/MongoDB/ServerDescription.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API ServerDescription @@ -239,7 +238,7 @@ inline void ServerDescription::setAddress(const Net::SocketAddress& address) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_ServerDescription_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/TopologyChangeNotification.h b/MongoDB/include/Poco/MongoDB/TopologyChangeNotification.h index b67e8fcc22..5b6ba56010 100644 --- a/MongoDB/include/Poco/MongoDB/TopologyChangeNotification.h +++ b/MongoDB/include/Poco/MongoDB/TopologyChangeNotification.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class MongoDB_API TopologyChangeNotification : public Notification @@ -117,7 +116,7 @@ inline std::string TopologyChangeNotification::name() const } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_TopologyChangeNotification_INCLUDED diff --git a/MongoDB/include/Poco/MongoDB/TopologyDescription.h b/MongoDB/include/Poco/MongoDB/TopologyDescription.h index fb75215496..82fcd5886e 100644 --- a/MongoDB/include/Poco/MongoDB/TopologyDescription.h +++ b/MongoDB/include/Poco/MongoDB/TopologyDescription.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { class Document; @@ -166,7 +165,7 @@ class MongoDB_API TopologyDescription }; -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB #endif // MongoDB_TopologyDescription_INCLUDED diff --git a/MongoDB/src/Array.cpp b/MongoDB/src/Array.cpp index 8bba4e3e3c..07d19366ac 100644 --- a/MongoDB/src/Array.cpp +++ b/MongoDB/src/Array.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { Array::Array(): @@ -74,4 +73,4 @@ std::string Array::toString(int indent) const } -} } // Namespace Poco::Mongo +} // namespace Poco::MongoDB diff --git a/MongoDB/src/Binary.cpp b/MongoDB/src/Binary.cpp index c92e56600a..e53a133388 100644 --- a/MongoDB/src/Binary.cpp +++ b/MongoDB/src/Binary.cpp @@ -23,8 +23,7 @@ using namespace std::string_literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { Binary::Binary(): @@ -116,4 +115,4 @@ UUID Binary::uuid() const } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/Connection.cpp b/MongoDB/src/Connection.cpp index 4b1f7064ee..80f0665321 100644 --- a/MongoDB/src/Connection.cpp +++ b/MongoDB/src/Connection.cpp @@ -24,8 +24,7 @@ using namespace std::string_literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { Connection::SocketFactory::SocketFactory() = default; @@ -237,4 +236,4 @@ void Connection::readResponse(OpMsgMessage& response) -} } // Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/Database.cpp b/MongoDB/src/Database.cpp index 006d8dfe7a..5d2ba175fc 100644 --- a/MongoDB/src/Database.cpp +++ b/MongoDB/src/Database.cpp @@ -36,8 +36,7 @@ using namespace std::string_literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { const std::string Database::AUTH_SCRAM_SHA1("SCRAM-SHA-1"); @@ -379,4 +378,4 @@ Poco::MongoDB::Document::Ptr Database::createIndex( } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/Document.cpp b/MongoDB/src/Document.cpp index bf686ede3f..452cc71e9a 100644 --- a/MongoDB/src/Document.cpp +++ b/MongoDB/src/Document.cpp @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { Document::Document() @@ -290,4 +289,4 @@ bool Document::remove(const std::string& name) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/Element.cpp b/MongoDB/src/Element.cpp index e16f35344d..5a2e2fb1a4 100644 --- a/MongoDB/src/Element.cpp +++ b/MongoDB/src/Element.cpp @@ -15,8 +15,7 @@ #include "Poco/MongoDB/Element.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { Element::Element(const std::string& name) : _name(name) @@ -34,4 +33,4 @@ Element::~Element() } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/JavaScriptCode.cpp b/MongoDB/src/JavaScriptCode.cpp index e10732e140..b8d89d9158 100644 --- a/MongoDB/src/JavaScriptCode.cpp +++ b/MongoDB/src/JavaScriptCode.cpp @@ -15,8 +15,7 @@ #include "Poco/MongoDB/JavaScriptCode.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { JavaScriptCode::JavaScriptCode() @@ -30,4 +29,4 @@ JavaScriptCode::~JavaScriptCode() } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/Message.cpp b/MongoDB/src/Message.cpp index d6429e942e..f98069b2a1 100644 --- a/MongoDB/src/Message.cpp +++ b/MongoDB/src/Message.cpp @@ -15,8 +15,7 @@ #include "Poco/MongoDB/Message.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { Message::Message(MessageHeader::OpCode opcode): @@ -30,4 +29,4 @@ Message::~Message() } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/MessageHeader.cpp b/MongoDB/src/MessageHeader.cpp index 2df5935afd..3b16698532 100644 --- a/MongoDB/src/MessageHeader.cpp +++ b/MongoDB/src/MessageHeader.cpp @@ -18,8 +18,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { MessageHeader::MessageHeader(OpCode opCode): @@ -62,4 +61,4 @@ void MessageHeader::write(BinaryWriter& writer) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/ObjectId.cpp b/MongoDB/src/ObjectId.cpp index 82fe518748..45d7045d41 100644 --- a/MongoDB/src/ObjectId.cpp +++ b/MongoDB/src/ObjectId.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { ObjectId::ObjectId() @@ -99,4 +98,4 @@ std::string ObjectId::toString(const std::string& fmt) const } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/OpMsgCursor.cpp b/MongoDB/src/OpMsgCursor.cpp index eec9a6b207..f9938a0d00 100644 --- a/MongoDB/src/OpMsgCursor.cpp +++ b/MongoDB/src/OpMsgCursor.cpp @@ -45,8 +45,7 @@ using namespace std::string_literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { static const std::string keyCursor {"cursor"s}; @@ -245,4 +244,4 @@ template void OpMsgCursor::killImpl(Connection& connection); template void OpMsgCursor::killImpl(ReplicaSetConnection& connection); -} } // Namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/OpMsgMessage.cpp b/MongoDB/src/OpMsgMessage.cpp index e6b0af544d..3d9c16afdf 100644 --- a/MongoDB/src/OpMsgMessage.cpp +++ b/MongoDB/src/OpMsgMessage.cpp @@ -24,8 +24,7 @@ #define POCO_MONGODB_DUMP false -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { // Query and write const std::string OpMsgMessage::CMD_INSERT { "insert"s }; @@ -429,4 +428,4 @@ const std::string& commandIdentifier(const std::string& command) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/ReadPreference.cpp b/MongoDB/src/ReadPreference.cpp index dedd18f1a4..ee47807661 100644 --- a/MongoDB/src/ReadPreference.cpp +++ b/MongoDB/src/ReadPreference.cpp @@ -21,8 +21,7 @@ using namespace std::string_literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { const Poco::Int64 ReadPreference::NO_MAX_STALENESS; @@ -326,4 +325,4 @@ std::vector ReadPreference::selectByNearest(const std::vector } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/RegularExpression.cpp b/MongoDB/src/RegularExpression.cpp index 7ae2ed22b9..62819c0313 100644 --- a/MongoDB/src/RegularExpression.cpp +++ b/MongoDB/src/RegularExpression.cpp @@ -15,8 +15,7 @@ #include "Poco/MongoDB/RegularExpression.h" -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { RegularExpression::RegularExpression() @@ -74,4 +73,4 @@ SharedPtr RegularExpression::createRE() const } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/ReplicaSet.cpp b/MongoDB/src/ReplicaSet.cpp index a4ce1a158f..4d7cb51d7e 100644 --- a/MongoDB/src/ReplicaSet.cpp +++ b/MongoDB/src/ReplicaSet.cpp @@ -26,8 +26,7 @@ using namespace std::string_literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { // @@ -614,4 +613,4 @@ void ReplicaSet::updateTopologyFromAllServers() noexcept } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/ReplicaSetConnection.cpp b/MongoDB/src/ReplicaSetConnection.cpp index 217b2219c5..b7e53baf57 100644 --- a/MongoDB/src/ReplicaSetConnection.cpp +++ b/MongoDB/src/ReplicaSetConnection.cpp @@ -25,8 +25,7 @@ using namespace std::literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { // MongoDB error codes that indicate retriable errors @@ -334,4 +333,4 @@ void ReplicaSetConnection::markServerFailed() } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/ReplicaSetURI.cpp b/MongoDB/src/ReplicaSetURI.cpp index 43d34f4f0a..77d9700159 100644 --- a/MongoDB/src/ReplicaSetURI.cpp +++ b/MongoDB/src/ReplicaSetURI.cpp @@ -21,8 +21,7 @@ using namespace std::string_literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { ReplicaSetURI::ReplicaSetURI() @@ -491,4 +490,4 @@ std::string ReplicaSetURI::buildQueryString() const } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/ServerDescription.cpp b/MongoDB/src/ServerDescription.cpp index c31220d0ec..549b0d68d7 100644 --- a/MongoDB/src/ServerDescription.cpp +++ b/MongoDB/src/ServerDescription.cpp @@ -18,8 +18,7 @@ using namespace std::string_literals; -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { ServerDescription::ServerDescription() = default; @@ -251,4 +250,4 @@ std::string ServerDescription::typeToString(ServerType type) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/MongoDB/src/TopologyDescription.cpp b/MongoDB/src/TopologyDescription.cpp index 66b24c5ff0..ba139e587c 100644 --- a/MongoDB/src/TopologyDescription.cpp +++ b/MongoDB/src/TopologyDescription.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace MongoDB { +namespace Poco::MongoDB { TopologyDescription::TopologyDescription() = default; @@ -446,4 +445,4 @@ std::string TopologyDescription::typeToString(TopologyType type) } -} } // namespace Poco::MongoDB +} // namespace Poco::MongoDB diff --git a/Net/include/Poco/Net/AbstractHTTPRequestHandler.h b/Net/include/Poco/Net/AbstractHTTPRequestHandler.h index d034de7248..626845f073 100644 --- a/Net/include/Poco/Net/AbstractHTTPRequestHandler.h +++ b/Net/include/Poco/Net/AbstractHTTPRequestHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/HTTPResponse.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTMLForm; @@ -130,7 +129,7 @@ inline HTTPServerResponse& AbstractHTTPRequestHandler::response() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_AbstractHTTPRequestHandler_INCLUDED diff --git a/Net/include/Poco/Net/DNS.h b/Net/include/Poco/Net/DNS.h index 2de47b3e26..7151e355d2 100644 --- a/Net/include/Poco/Net/DNS.h +++ b/Net/include/Poco/Net/DNS.h @@ -24,8 +24,7 @@ #include "Poco/Net/HostEntry.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API DNS @@ -193,7 +192,7 @@ class Net_API DNS }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_DNS_INCLUDED diff --git a/Net/include/Poco/Net/DatagramSocket.h b/Net/include/Poco/Net/DatagramSocket.h index 82b1b60c9b..8768c2cc36 100644 --- a/Net/include/Poco/Net/DatagramSocket.h +++ b/Net/include/Poco/Net/DatagramSocket.h @@ -23,8 +23,7 @@ #include "Poco/Buffer.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API DatagramSocket: public Socket @@ -304,7 +303,7 @@ inline bool DatagramSocket::getBroadcast() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_DatagramSocket_INCLUDED diff --git a/Net/include/Poco/Net/DatagramSocketImpl.h b/Net/include/Poco/Net/DatagramSocketImpl.h index 6c1182e172..2e583e67c6 100644 --- a/Net/include/Poco/Net/DatagramSocketImpl.h +++ b/Net/include/Poco/Net/DatagramSocketImpl.h @@ -22,8 +22,7 @@ #include "Poco/Net/SocketImpl.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API DatagramSocketImpl: public SocketImpl @@ -49,7 +48,7 @@ class Net_API DatagramSocketImpl: public SocketImpl }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_DatagramSocketImpl_INCLUDED diff --git a/Net/include/Poco/Net/DialogSocket.h b/Net/include/Poco/Net/DialogSocket.h index 080140410c..0d7abd1d80 100644 --- a/Net/include/Poco/Net/DialogSocket.h +++ b/Net/include/Poco/Net/DialogSocket.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API DialogSocket: public StreamSocket @@ -205,7 +204,7 @@ class Net_API DialogSocket: public StreamSocket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_DialogSocket_INCLUDED diff --git a/Net/include/Poco/Net/EscapeHTMLStream.h b/Net/include/Poco/Net/EscapeHTMLStream.h index 08dde08831..c181472b98 100644 --- a/Net/include/Poco/Net/EscapeHTMLStream.h +++ b/Net/include/Poco/Net/EscapeHTMLStream.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API EscapeHTMLStreamBuf: public Poco::UnbufferedStreamBuf @@ -83,7 +82,7 @@ class Net_API EscapeHTMLOutputStream: public EscapeHTMLIOS, public std::ostream }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_EscapeHTMLStream_INCLUDED diff --git a/Net/include/Poco/Net/FTPClientSession.h b/Net/include/Poco/Net/FTPClientSession.h index 576fea035d..d7a4cbb1ba 100644 --- a/Net/include/Poco/Net/FTPClientSession.h +++ b/Net/include/Poco/Net/FTPClientSession.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class SocketStream; @@ -430,7 +429,7 @@ inline const std::string& FTPClientSession::getHost() const return _host; } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_FTPClientSession_INCLUDED diff --git a/Net/include/Poco/Net/FTPStreamFactory.h b/Net/include/Poco/Net/FTPStreamFactory.h index ade0425274..f80dfa50cc 100644 --- a/Net/include/Poco/Net/FTPStreamFactory.h +++ b/Net/include/Poco/Net/FTPStreamFactory.h @@ -23,8 +23,7 @@ #include "Poco/URIStreamFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API FTPPasswordProvider @@ -114,7 +113,7 @@ class Net_API FTPStreamFactory: public Poco::URIStreamFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_FTPStreamFactory_INCLUDED diff --git a/Net/include/Poco/Net/FilePartSource.h b/Net/include/Poco/Net/FilePartSource.h index b7aedd6b85..8039ffcb3a 100644 --- a/Net/include/Poco/Net/FilePartSource.h +++ b/Net/include/Poco/Net/FilePartSource.h @@ -23,8 +23,7 @@ #include "Poco/FileStream.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API FilePartSource: public PartSource @@ -71,7 +70,7 @@ class Net_API FilePartSource: public PartSource }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_FilePartSource_INCLUDED diff --git a/Net/include/Poco/Net/HTMLForm.h b/Net/include/Poco/Net/HTMLForm.h index ac62cc3541..94392c7ae6 100644 --- a/Net/include/Poco/Net/HTMLForm.h +++ b/Net/include/Poco/Net/HTMLForm.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPRequest; @@ -266,7 +265,7 @@ inline std::size_t HTMLForm::getValueLengthLimit() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTMLForm_INCLUDED diff --git a/Net/include/Poco/Net/HTTPAuthenticationParams.h b/Net/include/Poco/Net/HTTPAuthenticationParams.h index ebfd7812af..630cdad49c 100644 --- a/Net/include/Poco/Net/HTTPAuthenticationParams.h +++ b/Net/include/Poco/Net/HTTPAuthenticationParams.h @@ -22,8 +22,7 @@ #include "Poco/Net/NameValueCollection.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPRequest; @@ -101,7 +100,7 @@ class Net_API HTTPAuthenticationParams: public NameValueCollection }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPAuthenticationParams_INCLUDED diff --git a/Net/include/Poco/Net/HTTPBasicCredentials.h b/Net/include/Poco/Net/HTTPBasicCredentials.h index 56894db8ca..d57d469239 100644 --- a/Net/include/Poco/Net/HTTPBasicCredentials.h +++ b/Net/include/Poco/Net/HTTPBasicCredentials.h @@ -21,8 +21,7 @@ #include "Poco/Net/Net.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPRequest; @@ -117,7 +116,7 @@ inline bool HTTPBasicCredentials::empty() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPBasicCredentials_INCLUDED diff --git a/Net/include/Poco/Net/HTTPBasicStreamBuf.h b/Net/include/Poco/Net/HTTPBasicStreamBuf.h index 02ec1362a8..7c84b78c2f 100644 --- a/Net/include/Poco/Net/HTTPBasicStreamBuf.h +++ b/Net/include/Poco/Net/HTTPBasicStreamBuf.h @@ -23,14 +23,13 @@ #include "Poco/Net/HTTPBufferAllocator.h" -namespace Poco { -namespace Net { +namespace Poco::Net { using HTTPBasicStreamBuf = Poco::BasicBufferedStreamBuf, HTTPBufferAllocator>; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPBasicStreamBuf_INCLUDED diff --git a/Net/include/Poco/Net/HTTPBufferAllocator.h b/Net/include/Poco/Net/HTTPBufferAllocator.h index af312001b9..ff5bdbec5c 100644 --- a/Net/include/Poco/Net/HTTPBufferAllocator.h +++ b/Net/include/Poco/Net/HTTPBufferAllocator.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPBufferAllocator @@ -56,7 +55,7 @@ inline const Poco::MemoryPool& HTTPBufferAllocator::pool() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPBufferAllocator_INCLUDED diff --git a/Net/include/Poco/Net/HTTPChunkedStream.h b/Net/include/Poco/Net/HTTPChunkedStream.h index d2d70aa4dd..0dbffffbe6 100644 --- a/Net/include/Poco/Net/HTTPChunkedStream.h +++ b/Net/include/Poco/Net/HTTPChunkedStream.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPSession; @@ -101,7 +100,7 @@ class Net_API HTTPChunkedOutputStream: public HTTPChunkedIOS, public std::ostrea }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPChunkedStream_INCLUDED diff --git a/Net/include/Poco/Net/HTTPClientSession.h b/Net/include/Poco/Net/HTTPClientSession.h index 066c16422c..1c3ddb8b19 100644 --- a/Net/include/Poco/Net/HTTPClientSession.h +++ b/Net/include/Poco/Net/HTTPClientSession.h @@ -30,8 +30,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPRequest; @@ -455,7 +454,7 @@ inline const Poco::Timespan& HTTPClientSession::getKeepAliveTimeout() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPClientSession_INCLUDED diff --git a/Net/include/Poco/Net/HTTPCookie.h b/Net/include/Poco/Net/HTTPCookie.h index 7360718da1..a81f298f68 100644 --- a/Net/include/Poco/Net/HTTPCookie.h +++ b/Net/include/Poco/Net/HTTPCookie.h @@ -21,8 +21,7 @@ #include "Poco/Net/Net.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NameValueCollection; @@ -297,7 +296,7 @@ inline HTTPCookie::SameSite HTTPCookie::getSameSite() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPCookie_INCLUDED diff --git a/Net/include/Poco/Net/HTTPDigestCredentials.h b/Net/include/Poco/Net/HTTPDigestCredentials.h index b8c5af4386..955d4707ea 100644 --- a/Net/include/Poco/Net/HTTPDigestCredentials.h +++ b/Net/include/Poco/Net/HTTPDigestCredentials.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPRequest; @@ -195,7 +194,7 @@ inline bool HTTPDigestCredentials::empty() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPDigestCredentials_INCLUDED diff --git a/Net/include/Poco/Net/HTTPFixedLengthStream.h b/Net/include/Poco/Net/HTTPFixedLengthStream.h index 26468fff9d..9c1d519cb0 100644 --- a/Net/include/Poco/Net/HTTPFixedLengthStream.h +++ b/Net/include/Poco/Net/HTTPFixedLengthStream.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPSession; @@ -104,7 +103,7 @@ class Net_API HTTPFixedLengthOutputStream: public HTTPFixedLengthIOS, public std }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPFixedLengthStream_INCLUDED diff --git a/Net/include/Poco/Net/HTTPHeaderStream.h b/Net/include/Poco/Net/HTTPHeaderStream.h index 61da780e8a..1876374ef0 100644 --- a/Net/include/Poco/Net/HTTPHeaderStream.h +++ b/Net/include/Poco/Net/HTTPHeaderStream.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPSession; @@ -96,7 +95,7 @@ class Net_API HTTPHeaderOutputStream: public HTTPHeaderIOS, public std::ostream }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPHeaderStream_INCLUDED diff --git a/Net/include/Poco/Net/HTTPIOStream.h b/Net/include/Poco/Net/HTTPIOStream.h index 32792ec4de..9f71a9a7dc 100644 --- a/Net/include/Poco/Net/HTTPIOStream.h +++ b/Net/include/Poco/Net/HTTPIOStream.h @@ -23,8 +23,7 @@ #include "Poco/UnbufferedStreamBuf.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPClientSession; @@ -82,7 +81,7 @@ class Net_API HTTPResponseStream: public HTTPResponseIOS, public std::istream }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPIOStream_INCLUDED diff --git a/Net/include/Poco/Net/HTTPMessage.h b/Net/include/Poco/Net/HTTPMessage.h index d477afd812..3fc95834ae 100644 --- a/Net/include/Poco/Net/HTTPMessage.h +++ b/Net/include/Poco/Net/HTTPMessage.h @@ -22,8 +22,7 @@ #include "Poco/Net/MessageHeader.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class MediaType; @@ -183,7 +182,7 @@ inline bool HTTPMessage::hasContentLength() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPMessage_INCLUDED diff --git a/Net/include/Poco/Net/HTTPNTLMCredentials.h b/Net/include/Poco/Net/HTTPNTLMCredentials.h index e972ccc7e3..6da54fcbe2 100644 --- a/Net/include/Poco/Net/HTTPNTLMCredentials.h +++ b/Net/include/Poco/Net/HTTPNTLMCredentials.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPRequest; @@ -162,7 +161,7 @@ inline bool HTTPNTLMCredentials::empty() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPNTLMCredentials_INCLUDED diff --git a/Net/include/Poco/Net/HTTPObserver.h b/Net/include/Poco/Net/HTTPObserver.h index 104b7f5f9b..55105c3f38 100644 --- a/Net/include/Poco/Net/HTTPObserver.h +++ b/Net/include/Poco/Net/HTTPObserver.h @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -167,7 +166,7 @@ class HTTPObserver: public AbstractObserver mutable Poco::Mutex _mutex; }; -}} // namespace Poco:Net +} // namespace Poco::Net #endif // Net_HTTPObserver_INCLUDED diff --git a/Net/include/Poco/Net/HTTPReactorServer.h b/Net/include/Poco/Net/HTTPReactorServer.h index 952451c674..7db660feab 100644 --- a/Net/include/Poco/Net/HTTPReactorServer.h +++ b/Net/include/Poco/Net/HTTPReactorServer.h @@ -6,8 +6,7 @@ #include "Poco/Net/HTTPSession.h" #include "Poco/Net/TCPReactorServer.h" #include "Poco/ThreadPool.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPReactorServer @@ -29,5 +28,5 @@ class Net_API HTTPReactorServer ThreadPool _threadPool; }; -}} // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/include/Poco/Net/HTTPReactorServerSession.h b/Net/include/Poco/Net/HTTPReactorServerSession.h index 11e73f03a1..2abd8d6693 100644 --- a/Net/include/Poco/Net/HTTPReactorServerSession.h +++ b/Net/include/Poco/Net/HTTPReactorServerSession.h @@ -6,8 +6,7 @@ #include "Poco/Net/StreamSocket.h" #include #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPReactorServerSession : public HTTPSession @@ -58,7 +57,7 @@ class Net_API HTTPReactorServerSession : public HTTPSession StreamSocket _realsocket; }; -}} // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPReactorServerSession_INCLUDED diff --git a/Net/include/Poco/Net/HTTPRequest.h b/Net/include/Poco/Net/HTTPRequest.h index bbf2a8b9e1..629b5fbb79 100644 --- a/Net/include/Poco/Net/HTTPRequest.h +++ b/Net/include/Poco/Net/HTTPRequest.h @@ -22,8 +22,7 @@ #include "Poco/Net/HTTPMessage.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPRequest: public HTTPMessage @@ -203,7 +202,7 @@ inline const std::string& HTTPRequest::getURI() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPRequest_INCLUDED diff --git a/Net/include/Poco/Net/HTTPRequestHandler.h b/Net/include/Poco/Net/HTTPRequestHandler.h index 41e9695537..1c7ebe446d 100644 --- a/Net/include/Poco/Net/HTTPRequestHandler.h +++ b/Net/include/Poco/Net/HTTPRequestHandler.h @@ -21,8 +21,7 @@ #include "Poco/Net/Net.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPServerRequest; @@ -61,7 +60,7 @@ class Net_API HTTPRequestHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPRequestHandler_INCLUDED diff --git a/Net/include/Poco/Net/HTTPRequestHandlerFactory.h b/Net/include/Poco/Net/HTTPRequestHandlerFactory.h index 6373a1471e..67b822bd0f 100644 --- a/Net/include/Poco/Net/HTTPRequestHandlerFactory.h +++ b/Net/include/Poco/Net/HTTPRequestHandlerFactory.h @@ -23,8 +23,7 @@ #include "Poco/BasicEvent.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPServerRequest; @@ -72,7 +71,7 @@ class Net_API HTTPRequestHandlerFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPRequestHandlerFactory_INCLUDED diff --git a/Net/include/Poco/Net/HTTPResponse.h b/Net/include/Poco/Net/HTTPResponse.h index f448801a67..c9ecf9db88 100644 --- a/Net/include/Poco/Net/HTTPResponse.h +++ b/Net/include/Poco/Net/HTTPResponse.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPCookie; @@ -303,7 +302,7 @@ inline const std::string& HTTPResponse::getReason() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPResponse_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServer.h b/Net/include/Poco/Net/HTTPServer.h index 69f092a673..8d3fabed83 100644 --- a/Net/include/Poco/Net/HTTPServer.h +++ b/Net/include/Poco/Net/HTTPServer.h @@ -24,8 +24,7 @@ #include "Poco/Net/HTTPServerParams.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPServer: public TCPServer @@ -97,7 +96,7 @@ class Net_API HTTPServer: public TCPServer }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServer_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServerConnection.h b/Net/include/Poco/Net/HTTPServerConnection.h index fc75f8c889..08593e34ce 100644 --- a/Net/include/Poco/Net/HTTPServerConnection.h +++ b/Net/include/Poco/Net/HTTPServerConnection.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPServerSession; @@ -60,7 +59,7 @@ class Net_API HTTPServerConnection: public TCPServerConnection }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServerConnection_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServerConnectionFactory.h b/Net/include/Poco/Net/HTTPServerConnectionFactory.h index 876360c47e..52793e6af1 100644 --- a/Net/include/Poco/Net/HTTPServerConnectionFactory.h +++ b/Net/include/Poco/Net/HTTPServerConnectionFactory.h @@ -24,8 +24,7 @@ #include "Poco/Net/HTTPServerParams.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPServerConnectionFactory: public TCPServerConnectionFactory @@ -49,7 +48,7 @@ class Net_API HTTPServerConnectionFactory: public TCPServerConnectionFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServerConnectionFactory_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServerParams.h b/Net/include/Poco/Net/HTTPServerParams.h index 7691677bc5..914659ebf0 100644 --- a/Net/include/Poco/Net/HTTPServerParams.h +++ b/Net/include/Poco/Net/HTTPServerParams.h @@ -22,8 +22,7 @@ #include "Poco/Net/TCPServerParams.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPServerParams: public TCPServerParams @@ -164,7 +163,7 @@ inline bool HTTPServerParams::getAutoDecodeHeaders() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServerParams_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServerRequest.h b/Net/include/Poco/Net/HTTPServerRequest.h index 5a1760a776..868c7e83f2 100644 --- a/Net/include/Poco/Net/HTTPServerRequest.h +++ b/Net/include/Poco/Net/HTTPServerRequest.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPServerSession; @@ -74,7 +73,7 @@ class Net_API HTTPServerRequest: public HTTPRequest }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServerRequest_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServerRequestImpl.h b/Net/include/Poco/Net/HTTPServerRequestImpl.h index 7007a0193b..0ede09e98f 100644 --- a/Net/include/Poco/Net/HTTPServerRequestImpl.h +++ b/Net/include/Poco/Net/HTTPServerRequestImpl.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPServerSession; @@ -137,7 +136,7 @@ inline HTTPSession& HTTPServerRequestImpl::session() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServerRequestImpl_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServerResponse.h b/Net/include/Poco/Net/HTTPServerResponse.h index 8ffbcfa4d7..221973ca37 100644 --- a/Net/include/Poco/Net/HTTPServerResponse.h +++ b/Net/include/Poco/Net/HTTPServerResponse.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPServerSession; @@ -110,7 +109,7 @@ class Net_API HTTPServerResponse: public HTTPResponse }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServerResponse_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServerResponseImpl.h b/Net/include/Poco/Net/HTTPServerResponseImpl.h index da2cb3e423..0034eb7cc2 100644 --- a/Net/include/Poco/Net/HTTPServerResponseImpl.h +++ b/Net/include/Poco/Net/HTTPServerResponseImpl.h @@ -23,8 +23,7 @@ #include "Poco/Net/HTTPServerResponse.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPServerSession; @@ -134,7 +133,7 @@ inline void HTTPServerResponseImpl::attachRequest(HTTPServerRequestImpl* pReques } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServerResponseImpl_INCLUDED diff --git a/Net/include/Poco/Net/HTTPServerSession.h b/Net/include/Poco/Net/HTTPServerSession.h index ad7abd270f..16b3be0dc6 100644 --- a/Net/include/Poco/Net/HTTPServerSession.h +++ b/Net/include/Poco/Net/HTTPServerSession.h @@ -26,8 +26,7 @@ #include "Poco/Timespan.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPServerSession: public HTTPSession @@ -70,7 +69,7 @@ inline bool HTTPServerSession::canKeepAlive() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPServerSession_INCLUDED diff --git a/Net/include/Poco/Net/HTTPSession.h b/Net/include/Poco/Net/HTTPSession.h index ff8de905b3..b39c3d7cac 100644 --- a/Net/include/Poco/Net/HTTPSession.h +++ b/Net/include/Poco/Net/HTTPSession.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPSession @@ -352,7 +351,7 @@ inline MessageHeader& HTTPSession::responseTrailer() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSession_INCLUDED diff --git a/Net/include/Poco/Net/HTTPSessionFactory.h b/Net/include/Poco/Net/HTTPSessionFactory.h index 58bbc7a3ff..324d47afb8 100644 --- a/Net/include/Poco/Net/HTTPSessionFactory.h +++ b/Net/include/Poco/Net/HTTPSessionFactory.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPSessionInstantiator; @@ -161,7 +160,7 @@ inline const HTTPClientSession::ProxyConfig& HTTPSessionFactory::getProxyConfig( } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSessionFactoryMgr_INCLUDED diff --git a/Net/include/Poco/Net/HTTPSessionInstantiator.h b/Net/include/Poco/Net/HTTPSessionInstantiator.h index 3cfedfa91c..131a73b229 100644 --- a/Net/include/Poco/Net/HTTPSessionInstantiator.h +++ b/Net/include/Poco/Net/HTTPSessionInstantiator.h @@ -23,8 +23,7 @@ #include "Poco/URI.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPSessionInstantiator @@ -74,7 +73,7 @@ inline const HTTPClientSession::ProxyConfig& HTTPSessionInstantiator::getProxyCo } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSessionInstantiator_INCLUDED diff --git a/Net/include/Poco/Net/HTTPStream.h b/Net/include/Poco/Net/HTTPStream.h index 7c309c5746..a1dfa707f0 100644 --- a/Net/include/Poco/Net/HTTPStream.h +++ b/Net/include/Poco/Net/HTTPStream.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPSession; @@ -97,7 +96,7 @@ class Net_API HTTPOutputStream: public HTTPIOS, public std::ostream }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPStream_INCLUDED diff --git a/Net/include/Poco/Net/HTTPStreamFactory.h b/Net/include/Poco/Net/HTTPStreamFactory.h index 05beaab3a8..fa1dc0c147 100644 --- a/Net/include/Poco/Net/HTTPStreamFactory.h +++ b/Net/include/Poco/Net/HTTPStreamFactory.h @@ -23,8 +23,7 @@ #include "Poco/URIStreamFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HTTPStreamFactory: public Poco::URIStreamFactory @@ -86,7 +85,7 @@ class Net_API HTTPStreamFactory: public Poco::URIStreamFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPStreamFactory_INCLUDED diff --git a/Net/include/Poco/Net/HostEntry.h b/Net/include/Poco/Net/HostEntry.h index a0fdcc6ad1..8632e2ceac 100644 --- a/Net/include/Poco/Net/HostEntry.h +++ b/Net/include/Poco/Net/HostEntry.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API HostEntry @@ -109,7 +108,7 @@ inline void swap(HostEntry& h1, HostEntry& h2) noexcept } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HostEntry_INCLUDED diff --git a/Net/include/Poco/Net/ICMPClient.h b/Net/include/Poco/Net/ICMPClient.h index cc421b451b..d1e7420748 100644 --- a/Net/include/Poco/Net/ICMPClient.h +++ b/Net/include/Poco/Net/ICMPClient.h @@ -25,8 +25,7 @@ #include "Poco/BasicEvent.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ICMPClient @@ -91,7 +90,7 @@ class Net_API ICMPClient }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ICMPClient_INCLUDED diff --git a/Net/include/Poco/Net/ICMPEventArgs.h b/Net/include/Poco/Net/ICMPEventArgs.h index 481e6e798e..cc482a4eff 100644 --- a/Net/include/Poco/Net/ICMPEventArgs.h +++ b/Net/include/Poco/Net/ICMPEventArgs.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ICMPEventArgs @@ -145,7 +144,7 @@ inline int ICMPEventArgs::sent() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif diff --git a/Net/include/Poco/Net/ICMPPacket.h b/Net/include/Poco/Net/ICMPPacket.h index 0084c28a07..c70ec64041 100644 --- a/Net/include/Poco/Net/ICMPPacket.h +++ b/Net/include/Poco/Net/ICMPPacket.h @@ -23,8 +23,7 @@ #include "Poco/Net/ICMPPacketImpl.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ICMPPacket @@ -85,7 +84,7 @@ class Net_API ICMPPacket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ICMPPacket_INCLUDED diff --git a/Net/include/Poco/Net/ICMPPacketImpl.h b/Net/include/Poco/Net/ICMPPacketImpl.h index 3a4b141289..cc88db4e6b 100644 --- a/Net/include/Poco/Net/ICMPPacketImpl.h +++ b/Net/include/Poco/Net/ICMPPacketImpl.h @@ -22,8 +22,7 @@ #include "Poco/Net/Socket.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ICMPPacketImpl @@ -138,7 +137,7 @@ inline int ICMPPacketImpl::maxPacketSize() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ICMPPacketImpl_INCLUDED diff --git a/Net/include/Poco/Net/ICMPSocket.h b/Net/include/Poco/Net/ICMPSocket.h index ca2e38b223..760f6af9ce 100644 --- a/Net/include/Poco/Net/ICMPSocket.h +++ b/Net/include/Poco/Net/ICMPSocket.h @@ -22,8 +22,7 @@ #include "Poco/Net/Socket.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ICMPSocket: public Socket @@ -92,7 +91,7 @@ class Net_API ICMPSocket: public Socket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ICMPSocket_INCLUDED diff --git a/Net/include/Poco/Net/ICMPSocketImpl.h b/Net/include/Poco/Net/ICMPSocketImpl.h index 639e614e99..8aea4abe5a 100644 --- a/Net/include/Poco/Net/ICMPSocketImpl.h +++ b/Net/include/Poco/Net/ICMPSocketImpl.h @@ -24,8 +24,7 @@ #include "Poco/Timestamp.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ICMPSocketImpl: public RawSocketImpl @@ -99,7 +98,7 @@ inline int ICMPSocketImpl::timeout() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ICMPSocketImpl_INCLUDED diff --git a/Net/include/Poco/Net/ICMPv4PacketImpl.h b/Net/include/Poco/Net/ICMPv4PacketImpl.h index 1127deb868..bb3932da0a 100644 --- a/Net/include/Poco/Net/ICMPv4PacketImpl.h +++ b/Net/include/Poco/Net/ICMPv4PacketImpl.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ICMPv4PacketImpl : public ICMPPacketImpl @@ -180,7 +179,7 @@ class Net_API ICMPv4PacketImpl : public ICMPPacketImpl }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ICMPv4PacketImpl_INCLUDED diff --git a/Net/include/Poco/Net/IPAddressImpl.h b/Net/include/Poco/Net/IPAddressImpl.h index 4cd6f40768..b56ae8e0d2 100644 --- a/Net/include/Poco/Net/IPAddressImpl.h +++ b/Net/include/Poco/Net/IPAddressImpl.h @@ -24,9 +24,7 @@ #include -namespace Poco { -namespace Net { -namespace Impl { +namespace Poco::Net::Impl { class IPAddressImpl : public Poco::RefCountedObject @@ -173,7 +171,7 @@ class IPv6AddressImpl: public IPAddressImpl #endif // POCO_HAVE_IPv6 -} } } // namespace Poco::Net::Impl +} // namespace Poco::Net::Impl #endif // Net_IPAddressImpl_INCLUDED diff --git a/Net/include/Poco/Net/MailMessage.h b/Net/include/Poco/Net/MailMessage.h index 0fd265c276..631e1387e4 100644 --- a/Net/include/Poco/Net/MailMessage.h +++ b/Net/include/Poco/Net/MailMessage.h @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class MediaType; @@ -352,7 +351,7 @@ inline const MailMessage::PartVec& MailMessage::parts() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_MailMessage_INCLUDED diff --git a/Net/include/Poco/Net/MailRecipient.h b/Net/include/Poco/Net/MailRecipient.h index 30d8442a69..33bbb5ada8 100644 --- a/Net/include/Poco/Net/MailRecipient.h +++ b/Net/include/Poco/Net/MailRecipient.h @@ -21,8 +21,7 @@ #include "Poco/Net/Net.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API MailRecipient @@ -114,7 +113,7 @@ inline void swap(MailRecipient& r1, MailRecipient& r2) noexcept } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_MailRecipient_INCLUDED diff --git a/Net/include/Poco/Net/MailStream.h b/Net/include/Poco/Net/MailStream.h index 869101b6d7..18fe7ec5f4 100644 --- a/Net/include/Poco/Net/MailStream.h +++ b/Net/include/Poco/Net/MailStream.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API MailStreamBuf: public Poco::UnbufferedStreamBuf @@ -141,7 +140,7 @@ class Net_API MailOutputStream: public MailIOS, public std::ostream }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_MailStream_INCLUDED diff --git a/Net/include/Poco/Net/MediaType.h b/Net/include/Poco/Net/MediaType.h index f08e323393..31ae7182c8 100644 --- a/Net/include/Poco/Net/MediaType.h +++ b/Net/include/Poco/Net/MediaType.h @@ -22,8 +22,7 @@ #include "Poco/Net/NameValueCollection.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API MediaType @@ -169,7 +168,7 @@ inline void swap(MediaType& m1, MediaType& m2) noexcept } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_MediaType_INCLUDED diff --git a/Net/include/Poco/Net/MessageHeader.h b/Net/include/Poco/Net/MessageHeader.h index 4e5d79174f..62ecb8ecb6 100644 --- a/Net/include/Poco/Net/MessageHeader.h +++ b/Net/include/Poco/Net/MessageHeader.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API MessageHeader: public NameValueCollection @@ -205,7 +204,7 @@ class Net_API MessageHeader: public NameValueCollection }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_MessageHeader_INCLUDED diff --git a/Net/include/Poco/Net/MultiSocketPoller.h b/Net/include/Poco/Net/MultiSocketPoller.h index 7a884cc1a3..7caa3f08af 100644 --- a/Net/include/Poco/Net/MultiSocketPoller.h +++ b/Net/include/Poco/Net/MultiSocketPoller.h @@ -25,8 +25,7 @@ #include "Poco/Net/UDPSocketReader.h" -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -124,7 +123,7 @@ class MultiSocketPoller }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_MultiSocketPoller_INCLUDED diff --git a/Net/include/Poco/Net/MulticastSocket.h b/Net/include/Poco/Net/MulticastSocket.h index e05513f915..4337e97725 100644 --- a/Net/include/Poco/Net/MulticastSocket.h +++ b/Net/include/Poco/Net/MulticastSocket.h @@ -28,8 +28,7 @@ #include "Poco/Net/NetworkInterface.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API MulticastSocket: public DatagramSocket @@ -126,7 +125,7 @@ class Net_API MulticastSocket: public DatagramSocket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // POCO_NET_HAS_INTERFACE diff --git a/Net/include/Poco/Net/MultipartReader.h b/Net/include/Poco/Net/MultipartReader.h index 99c739c9c6..a6a04ef434 100644 --- a/Net/include/Poco/Net/MultipartReader.h +++ b/Net/include/Poco/Net/MultipartReader.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class MessageHeader; @@ -155,7 +154,7 @@ class Net_API MultipartReader }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_MultipartReader_INCLUDED diff --git a/Net/include/Poco/Net/MultipartWriter.h b/Net/include/Poco/Net/MultipartWriter.h index cfd37bd4b9..4486dcea6e 100644 --- a/Net/include/Poco/Net/MultipartWriter.h +++ b/Net/include/Poco/Net/MultipartWriter.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class MessageHeader; @@ -103,7 +102,7 @@ inline std::ostream& MultipartWriter::stream() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_MultipartWriter_INCLUDED diff --git a/Net/include/Poco/Net/NTLMCredentials.h b/Net/include/Poco/Net/NTLMCredentials.h index 63081e1c3d..a9725b1995 100644 --- a/Net/include/Poco/Net/NTLMCredentials.h +++ b/Net/include/Poco/Net/NTLMCredentials.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API NTLMCredentials @@ -175,7 +174,7 @@ class Net_API NTLMCredentials }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_NTLMCredentials_INCLUDED diff --git a/Net/include/Poco/Net/NTPClient.h b/Net/include/Poco/Net/NTPClient.h index f7d60d4770..42ec4f489e 100644 --- a/Net/include/Poco/Net/NTPClient.h +++ b/Net/include/Poco/Net/NTPClient.h @@ -24,8 +24,7 @@ #include "Poco/BasicEvent.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API NTPClient @@ -58,7 +57,7 @@ class Net_API NTPClient }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_NTPClient_INCLUDED diff --git a/Net/include/Poco/Net/NTPEventArgs.h b/Net/include/Poco/Net/NTPEventArgs.h index 2593467ed7..4af19743ac 100644 --- a/Net/include/Poco/Net/NTPEventArgs.h +++ b/Net/include/Poco/Net/NTPEventArgs.h @@ -23,8 +23,7 @@ #include "Poco/Net/NTPPacket.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API NTPEventArgs @@ -78,7 +77,7 @@ inline void NTPEventArgs::setPacket(NTPPacket &packet) } -} } // namespace Poco::Net +} // namespace Poco::Net #endif diff --git a/Net/include/Poco/Net/NTPPacket.h b/Net/include/Poco/Net/NTPPacket.h index c2a9d261d5..504e8384f7 100644 --- a/Net/include/Poco/Net/NTPPacket.h +++ b/Net/include/Poco/Net/NTPPacket.h @@ -22,8 +22,7 @@ #include "Poco/Net/Net.h" #include "Poco/Timestamp.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API NTPPacket @@ -201,7 +200,7 @@ inline Poco::Int64 NTPPacket::transmitTimestamp() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_NTPPacket_INCLUDED diff --git a/Net/include/Poco/Net/NameValueCollection.h b/Net/include/Poco/Net/NameValueCollection.h index 135d750919..c37630de4a 100644 --- a/Net/include/Poco/Net/NameValueCollection.h +++ b/Net/include/Poco/Net/NameValueCollection.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API NameValueCollection @@ -203,7 +202,7 @@ inline std::size_t NameValueCollection::size() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_NameValueCollection_INCLUDED diff --git a/Net/include/Poco/Net/Net.h b/Net/include/Poco/Net/Net.h index dd77b936a0..c53ddca625 100644 --- a/Net/include/Poco/Net/Net.h +++ b/Net/include/Poco/Net/Net.h @@ -75,8 +75,7 @@ #endif // POCO_NET_NO_UNIX_SOCKET, POCO_HAVE_UNIX_SOCKET -namespace Poco { -namespace Net { +namespace Poco::Net { void Net_API initializeNetwork(); @@ -94,7 +93,7 @@ std::string Net_API htmlize(const std::string& str); /// characters (<, >, ", &) propery escaped. -} } // namespace Poco::Net +} // namespace Poco::Net // diff --git a/Net/include/Poco/Net/NetException.h b/Net/include/Poco/Net/NetException.h index 288bfd1752..fa3c877cba 100644 --- a/Net/include/Poco/Net/NetException.h +++ b/Net/include/Poco/Net/NetException.h @@ -22,8 +22,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Net { +namespace Poco::Net { POCO_DECLARE_EXCEPTION(Net_API, NetException, Poco::IOException) @@ -55,7 +54,7 @@ POCO_DECLARE_EXCEPTION(Net_API, UnsupportedFamilyException, NetException) POCO_DECLARE_EXCEPTION(Net_API, AddressFamilyMismatchException, NetException) -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_NetException_INCLUDED diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h index f5471e03a1..7f9eb857e2 100644 --- a/Net/include/Poco/Net/NetworkInterface.h +++ b/Net/include/Poco/Net/NetworkInterface.h @@ -31,8 +31,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class NetworkInterfaceImpl; @@ -340,7 +339,7 @@ inline bool NetworkInterface::operator == (const NetworkInterface& other) const } -} } // namespace Poco::Net +} // namespace Poco::Net Net_API std::ostream& operator << (std::ostream& ostr, const Poco::Net::NetworkInterface::MACAddress& addr); diff --git a/Net/include/Poco/Net/NullPartHandler.h b/Net/include/Poco/Net/NullPartHandler.h index 1b3b7bccb0..79cf572bed 100644 --- a/Net/include/Poco/Net/NullPartHandler.h +++ b/Net/include/Poco/Net/NullPartHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/PartHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API NullPartHandler: public PartHandler @@ -41,7 +40,7 @@ class Net_API NullPartHandler: public PartHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_NullPartHandler_INCLUDED diff --git a/Net/include/Poco/Net/OAuth10Credentials.h b/Net/include/Poco/Net/OAuth10Credentials.h index d9e16ce9cf..0e0476cbca 100644 --- a/Net/include/Poco/Net/OAuth10Credentials.h +++ b/Net/include/Poco/Net/OAuth10Credentials.h @@ -22,8 +22,7 @@ #include "Poco/URI.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPRequest; @@ -268,7 +267,7 @@ inline const std::string& OAuth10Credentials::getCallback() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_OAuth10Credentials_INCLUDED diff --git a/Net/include/Poco/Net/OAuth20Credentials.h b/Net/include/Poco/Net/OAuth20Credentials.h index 8da9e78139..4be762b107 100644 --- a/Net/include/Poco/Net/OAuth20Credentials.h +++ b/Net/include/Poco/Net/OAuth20Credentials.h @@ -21,8 +21,7 @@ #include "Poco/Net/Net.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPRequest; @@ -126,7 +125,7 @@ inline const std::string& OAuth20Credentials::getScheme() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_OAuth20Credentials_INCLUDED diff --git a/Net/include/Poco/Net/POP3ClientSession.h b/Net/include/Poco/Net/POP3ClientSession.h index a5be846c58..ff51288508 100644 --- a/Net/include/Poco/Net/POP3ClientSession.h +++ b/Net/include/Poco/Net/POP3ClientSession.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class MessageHeader; @@ -179,7 +178,7 @@ class Net_API POP3ClientSession }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_POP3ClientSession_INCLUDED diff --git a/Net/include/Poco/Net/ParallelSocketAcceptor.h b/Net/include/Poco/Net/ParallelSocketAcceptor.h index 85369ce8b4..85d2a2ee68 100644 --- a/Net/include/Poco/Net/ParallelSocketAcceptor.h +++ b/Net/include/Poco/Net/ParallelSocketAcceptor.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -232,7 +231,7 @@ class ParallelSocketAcceptor }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ParallelSocketAcceptor_INCLUDED diff --git a/Net/include/Poco/Net/ParallelSocketReactor.h b/Net/include/Poco/Net/ParallelSocketReactor.h index 15f737ae93..4a263edd49 100644 --- a/Net/include/Poco/Net/ParallelSocketReactor.h +++ b/Net/include/Poco/Net/ParallelSocketReactor.h @@ -38,8 +38,7 @@ using Poco::AutoPtr; using Poco::Thread; -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -88,7 +87,7 @@ class ParallelSocketReactor: public SR }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ParallelSocketReactor_INCLUDED diff --git a/Net/include/Poco/Net/PartHandler.h b/Net/include/Poco/Net/PartHandler.h index 4255daef77..909d9fb52d 100644 --- a/Net/include/Poco/Net/PartHandler.h +++ b/Net/include/Poco/Net/PartHandler.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class MessageHeader; @@ -62,7 +61,7 @@ class Net_API PartHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_PartHandler_INCLUDED diff --git a/Net/include/Poco/Net/PartSource.h b/Net/include/Poco/Net/PartSource.h index 443da4c64f..2363d2bd35 100644 --- a/Net/include/Poco/Net/PartSource.h +++ b/Net/include/Poco/Net/PartSource.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API PartSource @@ -104,7 +103,7 @@ inline const MessageHeader& PartSource::headers() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_PartSource_INCLUDED diff --git a/Net/include/Poco/Net/PartStore.h b/Net/include/Poco/Net/PartStore.h index 257b254bc3..b068866404 100644 --- a/Net/include/Poco/Net/PartStore.h +++ b/Net/include/Poco/Net/PartStore.h @@ -23,8 +23,7 @@ #include "Poco/FileStream.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API PartStore: public PartSource @@ -102,7 +101,7 @@ class FilePartStoreFactory: public PartStoreFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_PartStore_INCLUDED diff --git a/Net/include/Poco/Net/PollSet.h b/Net/include/Poco/Net/PollSet.h index 0be12738aa..a33f71445d 100644 --- a/Net/include/Poco/Net/PollSet.h +++ b/Net/include/Poco/Net/PollSet.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class PollSetImpl; @@ -123,7 +122,7 @@ class Net_API PollSet }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_PollSet_INCLUDED diff --git a/Net/include/Poco/Net/QuotedPrintableDecoder.h b/Net/include/Poco/Net/QuotedPrintableDecoder.h index 6b32a1dff2..05498b3769 100644 --- a/Net/include/Poco/Net/QuotedPrintableDecoder.h +++ b/Net/include/Poco/Net/QuotedPrintableDecoder.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API QuotedPrintableDecoderBuf: public Poco::UnbufferedStreamBuf @@ -80,7 +79,7 @@ class Net_API QuotedPrintableDecoder: public QuotedPrintableDecoderIOS, public s }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_QuotedPrintableDecoder_INCLUDED diff --git a/Net/include/Poco/Net/QuotedPrintableEncoder.h b/Net/include/Poco/Net/QuotedPrintableEncoder.h index 58d56d0c55..0ca3e8f275 100644 --- a/Net/include/Poco/Net/QuotedPrintableEncoder.h +++ b/Net/include/Poco/Net/QuotedPrintableEncoder.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API QuotedPrintableEncoderBuf: public Poco::UnbufferedStreamBuf @@ -79,7 +78,7 @@ class Net_API QuotedPrintableEncoder: public QuotedPrintableEncoderIOS, public s }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_QuotedPrintableEncoder_INCLUDED diff --git a/Net/include/Poco/Net/RawSocket.h b/Net/include/Poco/Net/RawSocket.h index 771eb0446a..153fb5688a 100644 --- a/Net/include/Poco/Net/RawSocket.h +++ b/Net/include/Poco/Net/RawSocket.h @@ -22,8 +22,7 @@ #include "Poco/Net/Socket.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API RawSocket: public Socket @@ -196,7 +195,7 @@ inline bool RawSocket::getBroadcast() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_RawSocket_INCLUDED diff --git a/Net/include/Poco/Net/RawSocketImpl.h b/Net/include/Poco/Net/RawSocketImpl.h index e6a9480a7c..9d3a20e71e 100644 --- a/Net/include/Poco/Net/RawSocketImpl.h +++ b/Net/include/Poco/Net/RawSocketImpl.h @@ -22,8 +22,7 @@ #include "Poco/Net/SocketImpl.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API RawSocketImpl: public SocketImpl @@ -50,7 +49,7 @@ class Net_API RawSocketImpl: public SocketImpl }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_RawSocketImpl_INCLUDED diff --git a/Net/include/Poco/Net/RemoteSyslogChannel.h b/Net/include/Poco/Net/RemoteSyslogChannel.h index 95cbd9dbd9..a077971a95 100644 --- a/Net/include/Poco/Net/RemoteSyslogChannel.h +++ b/Net/include/Poco/Net/RemoteSyslogChannel.h @@ -26,8 +26,7 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API RemoteSyslogChannel: public Poco::Channel @@ -161,7 +160,7 @@ class Net_API RemoteSyslogChannel: public Poco::Channel }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_RemoteSyslogChannel_INCLUDED diff --git a/Net/include/Poco/Net/RemoteSyslogListener.h b/Net/include/Poco/Net/RemoteSyslogListener.h index 7124a4548f..c45dac610e 100644 --- a/Net/include/Poco/Net/RemoteSyslogListener.h +++ b/Net/include/Poco/Net/RemoteSyslogListener.h @@ -25,8 +25,7 @@ #include "Poco/NotificationQueue.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class RemoteUDPListener; @@ -131,7 +130,7 @@ class Net_API RemoteSyslogListener: public Poco::SplitterChannel }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_RemoteSyslogListener_INCLUDED diff --git a/Net/include/Poco/Net/SMTPChannel.h b/Net/include/Poco/Net/SMTPChannel.h index 4e51469f87..9ca36dfd86 100644 --- a/Net/include/Poco/Net/SMTPChannel.h +++ b/Net/include/Poco/Net/SMTPChannel.h @@ -24,8 +24,7 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API SMTPChannel: public Poco::Channel @@ -105,7 +104,7 @@ inline bool SMTPChannel::isTrue(const std::string& value) const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SMTPChannel_INCLUDED diff --git a/Net/include/Poco/Net/SMTPClientSession.h b/Net/include/Poco/Net/SMTPClientSession.h index 6a1ad0bebd..1c45f2e086 100644 --- a/Net/include/Poco/Net/SMTPClientSession.h +++ b/Net/include/Poco/Net/SMTPClientSession.h @@ -24,8 +24,7 @@ #include "Poco/Timespan.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class MailMessage; @@ -238,7 +237,7 @@ inline const std::string& SMTPClientSession::host() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SMTPClientSession_INCLUDED diff --git a/Net/include/Poco/Net/SSPINTLMCredentials.h b/Net/include/Poco/Net/SSPINTLMCredentials.h index 7658263bf7..fff0d6ab93 100644 --- a/Net/include/Poco/Net/SSPINTLMCredentials.h +++ b/Net/include/Poco/Net/SSPINTLMCredentials.h @@ -27,8 +27,7 @@ #include "Poco/SharedPtr.h" -namespace Poco { -namespace Net { +namespace Poco::Net { struct NTLMContextImpl; @@ -77,7 +76,7 @@ class Net_API SSPINTLMCredentials }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SSPINTLMCredentials_INCLUDED diff --git a/Net/include/Poco/Net/ServerSocket.h b/Net/include/Poco/Net/ServerSocket.h index e3ab145949..f60e65eeae 100644 --- a/Net/include/Poco/Net/ServerSocket.h +++ b/Net/include/Poco/Net/ServerSocket.h @@ -23,8 +23,7 @@ #include "Poco/Net/StreamSocket.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ServerSocket: public Socket @@ -228,7 +227,7 @@ class Net_API ServerSocket: public Socket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ServerSocket_INCLUDED diff --git a/Net/include/Poco/Net/ServerSocketImpl.h b/Net/include/Poco/Net/ServerSocketImpl.h index b1ea05b98a..624ee1420a 100644 --- a/Net/include/Poco/Net/ServerSocketImpl.h +++ b/Net/include/Poco/Net/ServerSocketImpl.h @@ -22,8 +22,7 @@ #include "Poco/Net/SocketImpl.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API ServerSocketImpl: public SocketImpl @@ -39,7 +38,7 @@ class Net_API ServerSocketImpl: public SocketImpl }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_ServerSocketImpl_INCLUDED diff --git a/Net/include/Poco/Net/SingleSocketPoller.h b/Net/include/Poco/Net/SingleSocketPoller.h index be200c157c..d3b015b6b5 100644 --- a/Net/include/Poco/Net/SingleSocketPoller.h +++ b/Net/include/Poco/Net/SingleSocketPoller.h @@ -24,8 +24,7 @@ #include "Poco/Net/PollSet.h" -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -98,7 +97,7 @@ class SingleSocketPoller }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SingleSocketPoller_INCLUDED diff --git a/Net/include/Poco/Net/Socket.h b/Net/include/Poco/Net/Socket.h index 76734dcbd2..dc4a982843 100644 --- a/Net/include/Poco/Net/Socket.h +++ b/Net/include/Poco/Net/Socket.h @@ -28,8 +28,7 @@ #define POCO_CHECK_NEW_STATE_ON_MOVE #endif -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API Socket @@ -846,7 +845,7 @@ inline void Socket::init(int af) } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_Socket_INCLUDED diff --git a/Net/include/Poco/Net/SocketAcceptor.h b/Net/include/Poco/Net/SocketAcceptor.h index a9ac06299f..48a1d90b11 100644 --- a/Net/include/Poco/Net/SocketAcceptor.h +++ b/Net/include/Poco/Net/SocketAcceptor.h @@ -26,8 +26,7 @@ #include "Poco/NObserver.h" -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -185,7 +184,7 @@ class SocketAcceptor }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SocketAcceptor_INCLUDED diff --git a/Net/include/Poco/Net/SocketAddressImpl.h b/Net/include/Poco/Net/SocketAddressImpl.h index 7458a8118a..4d912ff10f 100644 --- a/Net/include/Poco/Net/SocketAddressImpl.h +++ b/Net/include/Poco/Net/SocketAddressImpl.h @@ -24,9 +24,7 @@ #include "Poco/RefCountedObject.h" -namespace Poco { -namespace Net { -namespace Impl { +namespace Poco::Net::Impl { class Net_API SocketAddressImpl : public Poco::RefCountedObject @@ -252,7 +250,7 @@ inline const char* LocalSocketAddressImpl::path() const #endif // POCO_OS_FAMILY_UNIX -} } } // namespace Poco::Net::Impl +} // namespace Poco::Net::Impl #endif // Net_SocketAddressImpl_INCLUDED diff --git a/Net/include/Poco/Net/SocketConnector.h b/Net/include/Poco/Net/SocketConnector.h index 3f6ab3c16a..ad5d64704b 100644 --- a/Net/include/Poco/Net/SocketConnector.h +++ b/Net/include/Poco/Net/SocketConnector.h @@ -27,8 +27,7 @@ #include "Poco/Observer.h" -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -200,7 +199,7 @@ class SocketConnector }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SocketConnector_INCLUDED diff --git a/Net/include/Poco/Net/SocketDefs.h b/Net/include/Poco/Net/SocketDefs.h index 9a66cd4067..cf1e14acfc 100644 --- a/Net/include/Poco/Net/SocketDefs.h +++ b/Net/include/Poco/Net/SocketDefs.h @@ -365,8 +365,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { #if defined(POCO_OS_FAMILY_WINDOWS) @@ -415,7 +414,7 @@ struct AddressFamily }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SocketDefs_INCLUDED diff --git a/Net/include/Poco/Net/SocketNotification.h b/Net/include/Poco/Net/SocketNotification.h index 27a49766d9..eae16931b8 100644 --- a/Net/include/Poco/Net/SocketNotification.h +++ b/Net/include/Poco/Net/SocketNotification.h @@ -23,8 +23,7 @@ #include "Poco/Notification.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class SocketReactor; @@ -174,7 +173,7 @@ inline Socket SocketNotification::socket() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SocketNotification_INCLUDED diff --git a/Net/include/Poco/Net/SocketNotifier.h b/Net/include/Poco/Net/SocketNotifier.h index e2651f52b7..67ec6aee99 100644 --- a/Net/include/Poco/Net/SocketNotifier.h +++ b/Net/include/Poco/Net/SocketNotifier.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Socket; @@ -121,7 +120,7 @@ inline std::size_t SocketNotifier::countObservers() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SocketNotifier_INCLUDED diff --git a/Net/include/Poco/Net/SocketReactor.h b/Net/include/Poco/Net/SocketReactor.h index 199d6febf5..48ef706428 100644 --- a/Net/include/Poco/Net/SocketReactor.h +++ b/Net/include/Poco/Net/SocketReactor.h @@ -33,10 +33,7 @@ #include -namespace Poco { - - -namespace Net { +namespace Poco::Net { class Socket; @@ -516,7 +513,7 @@ inline Poco::Thread& ScopedSocketReactor::thread() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SocketReactor_INCLUDED diff --git a/Net/include/Poco/Net/SocketStream.h b/Net/include/Poco/Net/SocketStream.h index cde8c71316..a89e356cb4 100644 --- a/Net/include/Poco/Net/SocketStream.h +++ b/Net/include/Poco/Net/SocketStream.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class StreamSocketImpl; @@ -171,7 +170,7 @@ inline StreamSocketImpl* SocketStreamBuf::socketImpl() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SocketStream_INCLUDED diff --git a/Net/include/Poco/Net/StreamSocketImpl.h b/Net/include/Poco/Net/StreamSocketImpl.h index 733631c088..3c314fb2a3 100644 --- a/Net/include/Poco/Net/StreamSocketImpl.h +++ b/Net/include/Poco/Net/StreamSocketImpl.h @@ -22,8 +22,7 @@ #include "Poco/Net/SocketImpl.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API StreamSocketImpl: public SocketImpl @@ -53,7 +52,7 @@ class Net_API StreamSocketImpl: public SocketImpl }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_StreamSocketImpl_INCLUDED diff --git a/Net/include/Poco/Net/StringPartSource.h b/Net/include/Poco/Net/StringPartSource.h index 344955a0ac..10828c080d 100644 --- a/Net/include/Poco/Net/StringPartSource.h +++ b/Net/include/Poco/Net/StringPartSource.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API StringPartSource: public PartSource @@ -65,7 +64,7 @@ class Net_API StringPartSource: public PartSource }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_StringPartSource_INCLUDED diff --git a/Net/include/Poco/Net/TCPReactorAcceptor.h b/Net/include/Poco/Net/TCPReactorAcceptor.h index 5bbe93e47a..04d60ee990 100644 --- a/Net/include/Poco/Net/TCPReactorAcceptor.h +++ b/Net/include/Poco/Net/TCPReactorAcceptor.h @@ -10,8 +10,7 @@ #include #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API TCPReactorAcceptor : public Poco::Net::SocketAcceptor @@ -42,7 +41,7 @@ class Net_API TCPReactorAcceptor : public Poco::Net::SocketAcceptor -namespace Poco { namespace Net { +namespace Poco::Net { class Net_API TCPReactorServer /// This class implements a TCP server using the Reactor pattern. @@ -43,7 +43,7 @@ class Net_API TCPReactorServer int _port; }; -}} // namespace Poco::Net +} // namespace Poco::Net #endif // Net_TCPReactorServer_INCLUDED diff --git a/Net/include/Poco/Net/TCPReactorServerConnection.h b/Net/include/Poco/Net/TCPReactorServerConnection.h index 8644ae39fd..a0f180eff1 100644 --- a/Net/include/Poco/Net/TCPReactorServerConnection.h +++ b/Net/include/Poco/Net/TCPReactorServerConnection.h @@ -7,8 +7,7 @@ #include #include -namespace Poco { -namespace Net { +namespace Poco::Net { class TCPReactorServerConnection; @@ -41,7 +40,7 @@ class Net_API TCPReactorServerConnection : public std::enable_shared_from_this -namespace Poco { -namespace Net { +namespace Poco::Net { class TCPServerDispatcher; @@ -253,7 +252,7 @@ inline TCPServerConnectionFilter::Ptr TCPServer::getConnectionFilter() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_TCPServer_INCLUDED diff --git a/Net/include/Poco/Net/TCPServerConnection.h b/Net/include/Poco/Net/TCPServerConnection.h index d4420b38db..9a2dd3275c 100644 --- a/Net/include/Poco/Net/TCPServerConnection.h +++ b/Net/include/Poco/Net/TCPServerConnection.h @@ -23,8 +23,7 @@ #include "Poco/Runnable.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API TCPServerConnection: public Poco::Runnable @@ -80,7 +79,7 @@ inline StreamSocket& TCPServerConnection::socket() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_TCPServerConnection_INCLUDED diff --git a/Net/include/Poco/Net/TCPServerConnectionFactory.h b/Net/include/Poco/Net/TCPServerConnectionFactory.h index cb941d0f9a..2ffb4c8b2c 100644 --- a/Net/include/Poco/Net/TCPServerConnectionFactory.h +++ b/Net/include/Poco/Net/TCPServerConnectionFactory.h @@ -23,8 +23,7 @@ #include "Poco/SharedPtr.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API TCPServerConnectionFactory @@ -124,7 +123,7 @@ class TCPServerConnectionFactoryImpl: public TCPServerConnectionFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_TCPServerConnectionFactory_INCLUDED diff --git a/Net/include/Poco/Net/TCPServerDispatcher.h b/Net/include/Poco/Net/TCPServerDispatcher.h index 3088fa265f..34bd49a6ab 100644 --- a/Net/include/Poco/Net/TCPServerDispatcher.h +++ b/Net/include/Poco/Net/TCPServerDispatcher.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API TCPServerDispatcher: public Poco::Runnable @@ -125,7 +124,7 @@ inline const TCPServerParams& TCPServerDispatcher::params() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_TCPServerDispatcher_INCLUDED diff --git a/Net/include/Poco/Net/TCPServerParams.h b/Net/include/Poco/Net/TCPServerParams.h index 8d935c038d..8e2436bddd 100644 --- a/Net/include/Poco/Net/TCPServerParams.h +++ b/Net/include/Poco/Net/TCPServerParams.h @@ -25,8 +25,7 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API TCPServerParams: public Poco::RefCountedObject @@ -160,7 +159,7 @@ inline Poco::Thread::Priority TCPServerParams::getThreadPriority() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_TCPServerParams_INCLUDED diff --git a/Net/include/Poco/Net/UDPClient.h b/Net/include/Poco/Net/UDPClient.h index 98889e45d6..60d9819df2 100644 --- a/Net/include/Poco/Net/UDPClient.h +++ b/Net/include/Poco/Net/UDPClient.h @@ -26,8 +26,7 @@ #include "Poco/Thread.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API UDPClient : public Poco::Runnable @@ -152,7 +151,7 @@ inline int UDPClient::errorBacklog() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_UDPClient_INCLUDED diff --git a/Net/include/Poco/Net/UDPHandler.h b/Net/include/Poco/Net/UDPHandler.h index e9777a47b0..fc78996ac3 100644 --- a/Net/include/Poco/Net/UDPHandler.h +++ b/Net/include/Poco/Net/UDPHandler.h @@ -35,8 +35,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { using UDPMsgSizeT = int; @@ -383,7 +382,7 @@ class UDPHandlerImpl: public Runnable, public RefCountedObject using UDPHandler = UDPHandlerImpl; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_UDPHandler_INCLUDED diff --git a/Net/include/Poco/Net/UDPServer.h b/Net/include/Poco/Net/UDPServer.h index a65036745a..c6d9c29285 100644 --- a/Net/include/Poco/Net/UDPServer.h +++ b/Net/include/Poco/Net/UDPServer.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { template >; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_UDPServer_INCLUDED diff --git a/Net/include/Poco/Net/UDPServerParams.h b/Net/include/Poco/Net/UDPServerParams.h index e734d56647..6e565cfc22 100644 --- a/Net/include/Poco/Net/UDPServerParams.h +++ b/Net/include/Poco/Net/UDPServerParams.h @@ -23,8 +23,7 @@ #include "Poco/Timespan.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class Net_API UDPServerParams @@ -116,7 +115,7 @@ inline int UDPServerParams::backlogThreshold() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_UDPServerParams_INCLUDED diff --git a/Net/include/Poco/Net/UDPSocketReader.h b/Net/include/Poco/Net/UDPSocketReader.h index b9fb23c787..95b96f1f37 100644 --- a/Net/include/Poco/Net/UDPSocketReader.h +++ b/Net/include/Poco/Net/UDPSocketReader.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -219,7 +218,7 @@ class UDPSocketReader }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_UDPSocketReader_INCLUDED diff --git a/Net/include/Poco/Net/WebSocket.h b/Net/include/Poco/Net/WebSocket.h index d0af70f324..ab83b5142d 100644 --- a/Net/include/Poco/Net/WebSocket.h +++ b/Net/include/Poco/Net/WebSocket.h @@ -24,8 +24,7 @@ #include "Poco/Buffer.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class WebSocketImpl; @@ -382,7 +381,7 @@ class Net_API WebSocket: public StreamSocket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_WebSocket_INCLUDED diff --git a/Net/include/Poco/Net/WebSocketImpl.h b/Net/include/Poco/Net/WebSocketImpl.h index e1ef2c830d..e268b5a686 100644 --- a/Net/include/Poco/Net/WebSocketImpl.h +++ b/Net/include/Poco/Net/WebSocketImpl.h @@ -24,8 +24,7 @@ #include "Poco/Buffer.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class HTTPSession; @@ -175,7 +174,7 @@ inline int WebSocketImpl::getMaxPayloadSize() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_WebSocketImpl_INCLUDED diff --git a/Net/src/AbstractHTTPRequestHandler.cpp b/Net/src/AbstractHTTPRequestHandler.cpp index c89145f92c..ddcbdab72b 100644 --- a/Net/src/AbstractHTTPRequestHandler.cpp +++ b/Net/src/AbstractHTTPRequestHandler.cpp @@ -23,8 +23,7 @@ using Poco::NumberFormatter; -namespace Poco { -namespace Net { +namespace Poco::Net { AbstractHTTPRequestHandler::AbstractHTTPRequestHandler(): @@ -106,4 +105,4 @@ void AbstractHTTPRequestHandler::sendErrorResponse(HTTPResponse::HTTPStatus stat } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/DNS.cpp b/Net/src/DNS.cpp index 6a7f7b5598..8938ff1b5f 100644 --- a/Net/src/DNS.cpp +++ b/Net/src/DNS.cpp @@ -36,8 +36,7 @@ using Poco::NumberFormatter; using Poco::IOException; -namespace Poco { -namespace Net { +namespace Poco::Net { typedef Poco::UInt32 punycode_uint; @@ -681,4 +680,4 @@ int punycode_decode(size_t input_length, const char input[], size_t *output_leng } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/DatagramSocket.cpp b/Net/src/DatagramSocket.cpp index 1cb71e6e80..c70e99260c 100644 --- a/Net/src/DatagramSocket.cpp +++ b/Net/src/DatagramSocket.cpp @@ -20,8 +20,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { DatagramSocket::DatagramSocket(): Socket(new DatagramSocketImpl) @@ -205,4 +204,4 @@ int DatagramSocket::receiveFrom(SocketBufVec& buffers, struct sockaddr** ppSA, p } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/DatagramSocketImpl.cpp b/Net/src/DatagramSocketImpl.cpp index 33073c7455..555470412a 100644 --- a/Net/src/DatagramSocketImpl.cpp +++ b/Net/src/DatagramSocketImpl.cpp @@ -19,8 +19,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { DatagramSocketImpl::DatagramSocketImpl() @@ -61,4 +60,4 @@ void DatagramSocketImpl::init(int af) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/DialogSocket.cpp b/Net/src/DialogSocket.cpp index 2e20d8ca94..4ca3c6d248 100644 --- a/Net/src/DialogSocket.cpp +++ b/Net/src/DialogSocket.cpp @@ -18,8 +18,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { DialogSocket::DialogSocket(): @@ -292,4 +291,4 @@ int DialogSocket::receiveRawBytes(void* buffer, int length) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/EscapeHTMLStream.cpp b/Net/src/EscapeHTMLStream.cpp index a999f72f1a..21336e32d8 100644 --- a/Net/src/EscapeHTMLStream.cpp +++ b/Net/src/EscapeHTMLStream.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/EscapeHTMLStream.h" -namespace Poco { -namespace Net { +namespace Poco::Net { EscapeHTMLStreamBuf::EscapeHTMLStreamBuf(std::ostream& ostr): @@ -89,4 +88,4 @@ EscapeHTMLOutputStream::~EscapeHTMLOutputStream() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/FTPClientSession.cpp b/Net/src/FTPClientSession.cpp index 910e119eb7..67be31afc6 100644 --- a/Net/src/FTPClientSession.cpp +++ b/Net/src/FTPClientSession.cpp @@ -24,8 +24,7 @@ using Poco::NumberFormatter; -namespace Poco { -namespace Net { +namespace Poco::Net { FTPClientSession::FTPClientSession(Poco::UInt16 activeDataPort): @@ -634,4 +633,4 @@ void FTPClientSession::endTransfer() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/FTPStreamFactory.cpp b/Net/src/FTPStreamFactory.cpp index 954b19f677..fe85c29398 100644 --- a/Net/src/FTPStreamFactory.cpp +++ b/Net/src/FTPStreamFactory.cpp @@ -28,8 +28,7 @@ using Poco::UnbufferedStreamBuf; using Poco::Path; -namespace Poco { -namespace Net { +namespace Poco::Net { class FTPStreamBuf: public UnbufferedStreamBuf @@ -240,4 +239,4 @@ void FTPStreamFactory::unregisterFactory() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/FilePartSource.cpp b/Net/src/FilePartSource.cpp index afd3a01db7..7af0654f35 100644 --- a/Net/src/FilePartSource.cpp +++ b/Net/src/FilePartSource.cpp @@ -22,8 +22,7 @@ using Poco::Path; using Poco::OpenFileException; -namespace Poco { -namespace Net { +namespace Poco::Net { FilePartSource::FilePartSource(const std::string& path): @@ -84,4 +83,4 @@ std::streamsize FilePartSource::getContentLength() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTMLForm.cpp b/Net/src/HTMLForm.cpp index fd5a1795c3..e8ab807d58 100644 --- a/Net/src/HTMLForm.cpp +++ b/Net/src/HTMLForm.cpp @@ -38,8 +38,7 @@ using Poco::URI; using Poco::icompare; -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string HTMLForm::ENCODING_URL = "application/x-www-form-urlencoded"; @@ -463,4 +462,4 @@ void HTMLForm::setValueLengthLimit(std::size_t limit) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPAuthenticationParams.cpp b/Net/src/HTTPAuthenticationParams.cpp index 7eddd0b547..e006b22ee2 100644 --- a/Net/src/HTTPAuthenticationParams.cpp +++ b/Net/src/HTTPAuthenticationParams.cpp @@ -61,8 +61,7 @@ namespace } -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string HTTPAuthenticationParams::REALM("realm"); @@ -325,4 +324,4 @@ void HTTPAuthenticationParams::parse(std::string::const_iterator first, std::str } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPBasicCredentials.cpp b/Net/src/HTTPBasicCredentials.cpp index 9307085e9c..f67dc38af3 100644 --- a/Net/src/HTTPBasicCredentials.cpp +++ b/Net/src/HTTPBasicCredentials.cpp @@ -26,8 +26,7 @@ using Poco::Base64Encoder; using Poco::icompare; -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string HTTPBasicCredentials::SCHEME = "Basic"; @@ -132,4 +131,4 @@ void HTTPBasicCredentials::parseAuthInfo(const std::string& authInfo) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPBufferAllocator.cpp b/Net/src/HTTPBufferAllocator.cpp index 2944e2a612..c737d19d41 100644 --- a/Net/src/HTTPBufferAllocator.cpp +++ b/Net/src/HTTPBufferAllocator.cpp @@ -18,8 +18,7 @@ using Poco::MemoryPool; -namespace Poco { -namespace Net { +namespace Poco::Net { MemoryPool HTTPBufferAllocator::_pool(HTTPBufferAllocator::BUFFER_SIZE, 16); @@ -41,4 +40,4 @@ void HTTPBufferAllocator::deallocate(char* ptr, std::streamsize size) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPChunkedStream.cpp b/Net/src/HTTPChunkedStream.cpp index 9dc015df2e..5c9926f3d6 100644 --- a/Net/src/HTTPChunkedStream.cpp +++ b/Net/src/HTTPChunkedStream.cpp @@ -25,8 +25,7 @@ using Poco::NumberFormatter; using Poco::NumberParser; -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -251,4 +250,4 @@ void HTTPChunkedOutputStream::operator delete(void* ptr) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPClientSession.cpp b/Net/src/HTTPClientSession.cpp index baec1397e5..4d716cd22c 100644 --- a/Net/src/HTTPClientSession.cpp +++ b/Net/src/HTTPClientSession.cpp @@ -31,8 +31,7 @@ using Poco::NumberFormatter; using Poco::IllegalStateException; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPClientSession::ProxyConfig HTTPClientSession::_globalProxyConfig; @@ -621,4 +620,4 @@ bool HTTPClientSession::bypassProxy() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPCookie.cpp b/Net/src/HTTPCookie.cpp index 4eafd61d82..f0d02f81c3 100644 --- a/Net/src/HTTPCookie.cpp +++ b/Net/src/HTTPCookie.cpp @@ -36,8 +36,7 @@ using Poco::icompare; using namespace std::string_literals; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPCookie::HTTPCookie(): @@ -390,4 +389,4 @@ std::string HTTPCookie::unescape(const std::string& str) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPCredentials.cpp b/Net/src/HTTPCredentials.cpp index 0e8d3ee569..611937d1c0 100644 --- a/Net/src/HTTPCredentials.cpp +++ b/Net/src/HTTPCredentials.cpp @@ -27,8 +27,7 @@ using Poco::icompare; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPCredentials::HTTPCredentials() @@ -257,4 +256,4 @@ void HTTPCredentials::extractCredentials(const Poco::URI& uri, std::string& user } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPDigestCredentials.cpp b/Net/src/HTTPDigestCredentials.cpp index a53feb84b3..0038afc7cc 100644 --- a/Net/src/HTTPDigestCredentials.cpp +++ b/Net/src/HTTPDigestCredentials.cpp @@ -66,8 +66,7 @@ namespace } -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string HTTPDigestCredentials::SCHEME = "Digest"; @@ -429,4 +428,4 @@ bool HTTPDigestCredentials::isAlgorithmSupported(const std::string& algorithm) c } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPFixedLengthStream.cpp b/Net/src/HTTPFixedLengthStream.cpp index 8b4d897f2b..25a3d9bc37 100644 --- a/Net/src/HTTPFixedLengthStream.cpp +++ b/Net/src/HTTPFixedLengthStream.cpp @@ -19,8 +19,7 @@ using Poco::BufferedStreamBuf; -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -178,4 +177,4 @@ void HTTPFixedLengthOutputStream::operator delete(void* ptr) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPHeaderStream.cpp b/Net/src/HTTPHeaderStream.cpp index fa925f6537..efbb479849 100644 --- a/Net/src/HTTPHeaderStream.cpp +++ b/Net/src/HTTPHeaderStream.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/HTTPSession.h" -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -175,4 +174,4 @@ void HTTPHeaderOutputStream::operator delete(void* ptr) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPIOStream.cpp b/Net/src/HTTPIOStream.cpp index c6492aed8f..3ee565d07f 100644 --- a/Net/src/HTTPIOStream.cpp +++ b/Net/src/HTTPIOStream.cpp @@ -19,8 +19,7 @@ using Poco::UnbufferedStreamBuf; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPResponseStreamBuf::HTTPResponseStreamBuf(std::istream& istr): @@ -62,4 +61,4 @@ HTTPResponseStream::~HTTPResponseStream() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPMessage.cpp b/Net/src/HTTPMessage.cpp index d6186cf7df..a4016a2956 100644 --- a/Net/src/HTTPMessage.cpp +++ b/Net/src/HTTPMessage.cpp @@ -24,8 +24,7 @@ using Poco::NumberParser; using Poco::icompare; -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string HTTPMessage::HTTP_1_0 = "HTTP/1.0"; @@ -200,4 +199,4 @@ bool HTTPMessage::getKeepAlive() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPNTLMCredentials.cpp b/Net/src/HTTPNTLMCredentials.cpp index 5ae497e5bb..f61e42b1b0 100644 --- a/Net/src/HTTPNTLMCredentials.cpp +++ b/Net/src/HTTPNTLMCredentials.cpp @@ -24,8 +24,7 @@ #include "Poco/String.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string HTTPNTLMCredentials::SCHEME = "NTLM"; @@ -184,4 +183,4 @@ std::string HTTPNTLMCredentials::createNTLMMessage(const std::string& responseAu } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPReactorServer.cpp b/Net/src/HTTPReactorServer.cpp index 14a9d80e59..0b356322c1 100644 --- a/Net/src/HTTPReactorServer.cpp +++ b/Net/src/HTTPReactorServer.cpp @@ -4,7 +4,7 @@ #include "Poco/Net/HTTPSession.h" #include -namespace Poco { namespace Net { +namespace Poco::Net { HTTPReactorServer::HTTPReactorServer(int port, HTTPServerParams::Ptr pParams, HTTPRequestHandlerFactory::Ptr pFactory) : _tcpReactorServer(port, pParams) @@ -109,5 +109,5 @@ void HTTPReactorServer::onError(const Poco::Exception& ex) throw ex; } -}} // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPReactorServerSession.cpp b/Net/src/HTTPReactorServerSession.cpp index 0a4e827cd9..7b75d1701f 100644 --- a/Net/src/HTTPReactorServerSession.cpp +++ b/Net/src/HTTPReactorServerSession.cpp @@ -3,8 +3,7 @@ #include "Poco/String.h" #include -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPReactorServerSession::HTTPReactorServerSession( @@ -221,5 +220,5 @@ int HTTPReactorServerSession::write(const char* buffer, std::streamsize length) } } -}} // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPRequest.cpp b/Net/src/HTTPRequest.cpp index d6dd883978..96397a591f 100644 --- a/Net/src/HTTPRequest.cpp +++ b/Net/src/HTTPRequest.cpp @@ -23,8 +23,7 @@ using Poco::NumberFormatter; -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string HTTPRequest::HTTP_GET = "GET"; @@ -308,4 +307,4 @@ void HTTPRequest::setExpectContinue(bool expectContinue) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPRequestHandler.cpp b/Net/src/HTTPRequestHandler.cpp index 1d73ff8227..1d60ce8bae 100644 --- a/Net/src/HTTPRequestHandler.cpp +++ b/Net/src/HTTPRequestHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/HTTPRequestHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPRequestHandler::HTTPRequestHandler() @@ -29,4 +28,4 @@ HTTPRequestHandler::~HTTPRequestHandler() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPRequestHandlerFactory.cpp b/Net/src/HTTPRequestHandlerFactory.cpp index d6f44f070b..146787f283 100644 --- a/Net/src/HTTPRequestHandlerFactory.cpp +++ b/Net/src/HTTPRequestHandlerFactory.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/HTTPRequestHandlerFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPRequestHandlerFactory::HTTPRequestHandlerFactory() @@ -29,4 +28,4 @@ HTTPRequestHandlerFactory::~HTTPRequestHandlerFactory() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPResponse.cpp b/Net/src/HTTPResponse.cpp index 837c1f2cd2..5252a77346 100644 --- a/Net/src/HTTPResponse.cpp +++ b/Net/src/HTTPResponse.cpp @@ -32,8 +32,7 @@ using Poco::DateTimeFormat; using Poco::DateTimeParser; -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string HTTPResponse::HTTP_REASON_CONTINUE = "Continue"; @@ -438,4 +437,4 @@ const std::string& HTTPResponse::getReasonForStatus(HTTPStatus status) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServer.cpp b/Net/src/HTTPServer.cpp index 31aa83d1be..c0ba61fcb7 100644 --- a/Net/src/HTTPServer.cpp +++ b/Net/src/HTTPServer.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/HTTPServerConnectionFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServer::HTTPServer(HTTPRequestHandlerFactory::Ptr pFactory, Poco::UInt16 portNumber, HTTPServerParams::Ptr pParams): @@ -53,4 +52,4 @@ void HTTPServer::stopAll(bool abortCurrent) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServerConnection.cpp b/Net/src/HTTPServerConnection.cpp index e6f3f6069c..69517a8edb 100644 --- a/Net/src/HTTPServerConnection.cpp +++ b/Net/src/HTTPServerConnection.cpp @@ -28,8 +28,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServerConnection::HTTPServerConnection(const StreamSocket& socket, HTTPServerParams::Ptr pParams, HTTPRequestHandlerFactory::Ptr pFactory): @@ -178,4 +177,4 @@ void HTTPServerConnection::onServerStopped(const bool& abortCurrent) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServerConnectionFactory.cpp b/Net/src/HTTPServerConnectionFactory.cpp index 8e17288f3b..c6f0ef4f0a 100644 --- a/Net/src/HTTPServerConnectionFactory.cpp +++ b/Net/src/HTTPServerConnectionFactory.cpp @@ -17,8 +17,7 @@ #include "Poco/Net/HTTPRequestHandlerFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServerConnectionFactory::HTTPServerConnectionFactory(HTTPServerParams::Ptr pParams, HTTPRequestHandlerFactory::Ptr pFactory): @@ -40,4 +39,4 @@ TCPServerConnection* HTTPServerConnectionFactory::createConnection(const StreamS } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServerParams.cpp b/Net/src/HTTPServerParams.cpp index e43a7f5f08..75a01ecb77 100644 --- a/Net/src/HTTPServerParams.cpp +++ b/Net/src/HTTPServerParams.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/HTTPServerParams.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServerParams::HTTPServerParams(): @@ -77,4 +76,4 @@ void HTTPServerParams::setAutoDecodeHeaders(bool autoDecode) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServerRequest.cpp b/Net/src/HTTPServerRequest.cpp index de3d46481a..6fc5ad4a7e 100644 --- a/Net/src/HTTPServerRequest.cpp +++ b/Net/src/HTTPServerRequest.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/HTTPServerRequest.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServerRequest::HTTPServerRequest() @@ -29,4 +28,4 @@ HTTPServerRequest::~HTTPServerRequest() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServerRequestImpl.cpp b/Net/src/HTTPServerRequestImpl.cpp index dbe3ed405a..6072515dc3 100644 --- a/Net/src/HTTPServerRequestImpl.cpp +++ b/Net/src/HTTPServerRequestImpl.cpp @@ -28,8 +28,7 @@ using Poco::icompare; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServerRequestImpl::HTTPServerRequestImpl(HTTPServerResponseImpl& response, HTTPSession& session, HTTPServerParams* pParams): @@ -85,4 +84,4 @@ StreamSocket HTTPServerRequestImpl::detachSocket() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServerResponse.cpp b/Net/src/HTTPServerResponse.cpp index e5550a3222..cae83b9e37 100644 --- a/Net/src/HTTPServerResponse.cpp +++ b/Net/src/HTTPServerResponse.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/HTTPServerResponse.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServerResponse::HTTPServerResponse() @@ -29,4 +28,4 @@ HTTPServerResponse::~HTTPServerResponse() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServerResponseImpl.cpp b/Net/src/HTTPServerResponseImpl.cpp index 81e3db6af9..e03aaaeed7 100644 --- a/Net/src/HTTPServerResponseImpl.cpp +++ b/Net/src/HTTPServerResponseImpl.cpp @@ -44,8 +44,7 @@ using Poco::Error; using namespace std::string_literals; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServerResponseImpl::HTTPServerResponseImpl(HTTPSession& session): @@ -184,4 +183,4 @@ void HTTPServerResponseImpl::requireAuthentication(const std::string& realm) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPServerSession.cpp b/Net/src/HTTPServerSession.cpp index dda32b605a..3f35323751 100644 --- a/Net/src/HTTPServerSession.cpp +++ b/Net/src/HTTPServerSession.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/HTTPServerSession.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPServerSession::HTTPServerSession(const StreamSocket& socket, HTTPServerParams::Ptr pParams): @@ -67,4 +66,4 @@ SocketAddress HTTPServerSession::serverAddress() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPSession.cpp b/Net/src/HTTPSession.cpp index c8fc747a72..aeb2acfd49 100644 --- a/Net/src/HTTPSession.cpp +++ b/Net/src/HTTPSession.cpp @@ -21,8 +21,7 @@ using Poco::TimeoutException; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSession::HTTPSession(): @@ -268,4 +267,4 @@ void HTTPSession::drainBuffer(Poco::Buffer& buffer) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPSessionFactory.cpp b/Net/src/HTTPSessionFactory.cpp index 66024b1865..fb723de535 100644 --- a/Net/src/HTTPSessionFactory.cpp +++ b/Net/src/HTTPSessionFactory.cpp @@ -22,8 +22,7 @@ using Poco::NotFoundException; using Poco::ExistsException; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSessionFactory::HTTPSessionFactory() @@ -149,4 +148,4 @@ HTTPSessionFactory::InstantiatorInfo::InstantiatorInfo(HTTPSessionInstantiator* } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPSessionInstantiator.cpp b/Net/src/HTTPSessionInstantiator.cpp index e92d8a4de5..1908d8ae93 100644 --- a/Net/src/HTTPSessionInstantiator.cpp +++ b/Net/src/HTTPSessionInstantiator.cpp @@ -20,8 +20,7 @@ using Poco::URI; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSessionInstantiator::HTTPSessionInstantiator() @@ -65,4 +64,4 @@ void HTTPSessionInstantiator::setProxyConfig(const HTTPClientSession::ProxyConfi -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPStream.cpp b/Net/src/HTTPStream.cpp index d6919ef482..4e03f2a230 100644 --- a/Net/src/HTTPStream.cpp +++ b/Net/src/HTTPStream.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/HTTPSession.h" -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -169,4 +168,4 @@ void HTTPOutputStream::operator delete(void* ptr) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HTTPStreamFactory.cpp b/Net/src/HTTPStreamFactory.cpp index 5c2fd64a17..f7a10162dd 100644 --- a/Net/src/HTTPStreamFactory.cpp +++ b/Net/src/HTTPStreamFactory.cpp @@ -35,8 +35,7 @@ using Poco::UnbufferedStreamBuf; using namespace std::string_literals; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPStreamFactory::HTTPStreamFactory(): @@ -185,4 +184,4 @@ void HTTPStreamFactory::unregisterFactory() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/HostEntry.cpp b/Net/src/HostEntry.cpp index b045d264f1..e0ef1cce9c 100644 --- a/Net/src/HostEntry.cpp +++ b/Net/src/HostEntry.cpp @@ -18,8 +18,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -149,4 +148,4 @@ HostEntry::~HostEntry() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ICMPClient.cpp b/Net/src/ICMPClient.cpp index e628ba09ab..3c4d2e027b 100644 --- a/Net/src/ICMPClient.cpp +++ b/Net/src/ICMPClient.cpp @@ -29,8 +29,7 @@ using Poco::TimeoutException; using Poco::Exception; -namespace Poco { -namespace Net { +namespace Poco::Net { ICMPClient::ICMPClient(SocketAddress::Family family, int dataSize, int ttl, int timeout): @@ -148,4 +147,4 @@ int ICMPClient::ping(SocketAddress& address, } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ICMPEventArgs.cpp b/Net/src/ICMPEventArgs.cpp index b9cac844a5..be2f85f279 100644 --- a/Net/src/ICMPEventArgs.cpp +++ b/Net/src/ICMPEventArgs.cpp @@ -26,8 +26,7 @@ using Poco::IOException; using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { ICMPEventArgs::ICMPEventArgs(const SocketAddress& address, int repetitions, int dataSize, int ttl): @@ -198,4 +197,4 @@ int ICMPEventArgs::maxRTT() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ICMPPacket.cpp b/Net/src/ICMPPacket.cpp index 22be7324bb..5b520e09d7 100644 --- a/Net/src/ICMPPacket.cpp +++ b/Net/src/ICMPPacket.cpp @@ -31,8 +31,7 @@ using Poco::UInt16; using Poco::Int32; -namespace Poco { -namespace Net { +namespace Poco::Net { ICMPPacket::ICMPPacket(IPAddress::Family family, int dataSize):_pImpl(nullptr) @@ -107,4 +106,4 @@ std::string ICMPPacket::typeDescription(int typeId) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ICMPPacketImpl.cpp b/Net/src/ICMPPacketImpl.cpp index 8ecb63bd68..25b3717ca1 100644 --- a/Net/src/ICMPPacketImpl.cpp +++ b/Net/src/ICMPPacketImpl.cpp @@ -29,8 +29,7 @@ using Poco::UInt16; using Poco::Int32; -namespace Poco { -namespace Net { +namespace Poco::Net { const UInt16 ICMPPacketImpl::MAX_PACKET_SIZE = 65535; @@ -101,4 +100,4 @@ unsigned short ICMPPacketImpl::checksum(UInt16 *addr, Int32 len) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ICMPSocket.cpp b/Net/src/ICMPSocket.cpp index 8e7e76b784..c11a312f70 100644 --- a/Net/src/ICMPSocket.cpp +++ b/Net/src/ICMPSocket.cpp @@ -21,8 +21,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { ICMPSocket::ICMPSocket(IPAddress::Family family, int dataSize, int ttl, int timeout): @@ -144,4 +143,4 @@ Poco::UInt16 ICMPSocket::mtu(const SocketAddress& address, Poco::UInt16 sz) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ICMPSocketImpl.cpp b/Net/src/ICMPSocketImpl.cpp index 5e27651fdd..f4676d35bd 100644 --- a/Net/src/ICMPSocketImpl.cpp +++ b/Net/src/ICMPSocketImpl.cpp @@ -24,8 +24,7 @@ using Poco::Timespan; using Poco::Exception; -namespace Poco { -namespace Net { +namespace Poco::Net { ICMPSocketImpl::ICMPSocketImpl(IPAddress::Family family, int dataSize, int ttl, int timeout): @@ -129,4 +128,4 @@ int ICMPSocketImpl::receiveFrom(void*, int, SocketAddress& address, int flags) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ICMPv4PacketImpl.cpp b/Net/src/ICMPv4PacketImpl.cpp index eff4eb3bec..7b8e6110dc 100644 --- a/Net/src/ICMPv4PacketImpl.cpp +++ b/Net/src/ICMPv4PacketImpl.cpp @@ -32,8 +32,7 @@ using Poco::UInt16; using Poco::Int32; -namespace Poco { -namespace Net { +namespace Poco::Net { const UInt8 ICMPv4PacketImpl::DESTINATION_UNREACHABLE_TYPE = 3; @@ -261,4 +260,4 @@ std::string ICMPv4PacketImpl::typeDescription(int typeId) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/IPAddress.cpp b/Net/src/IPAddress.cpp index dfc0c84569..ea1ea58f93 100644 --- a/Net/src/IPAddress.cpp +++ b/Net/src/IPAddress.cpp @@ -39,8 +39,7 @@ using Poco::Net::Impl::IPv6AddressImpl; #endif -namespace Poco { -namespace Net { +namespace Poco::Net { #if !defined(_MSC_VER) || defined(__STDC__) @@ -700,5 +699,5 @@ std::ostream& operator << (std::ostream& ostr, const Poco::Net::IPAddress& addr) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/IPAddressImpl.cpp b/Net/src/IPAddressImpl.cpp index 8e5fc02d36..f87c8448ab 100644 --- a/Net/src/IPAddressImpl.cpp +++ b/Net/src/IPAddressImpl.cpp @@ -58,9 +58,7 @@ unsigned maskBits(T val, unsigned size) } // namespace -namespace Poco { -namespace Net { -namespace Impl { +namespace Poco::Net::Impl { // @@ -826,4 +824,4 @@ bool IPv6AddressImpl::operator != (const IPv6AddressImpl& addr) const #endif // POCO_HAVE_IPv6 -} } } // namespace Poco::Net::Impl +} // namespace Poco::Net::Impl diff --git a/Net/src/MailMessage.cpp b/Net/src/MailMessage.cpp index a53fc6513b..0ad8d592aa 100644 --- a/Net/src/MailMessage.cpp +++ b/Net/src/MailMessage.cpp @@ -45,8 +45,7 @@ using Poco::StringTokenizer; using Poco::icompare; -namespace Poco { -namespace Net { +namespace Poco::Net { namespace @@ -749,4 +748,4 @@ std::string MultipartSource::contentTypeWithBoundary(const std::string& contentT } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/MailRecipient.cpp b/Net/src/MailRecipient.cpp index 63cff056c7..2025fc5075 100644 --- a/Net/src/MailRecipient.cpp +++ b/Net/src/MailRecipient.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { MailRecipient::MailRecipient(): @@ -91,4 +90,4 @@ void MailRecipient::setRealName(const std::string& realName) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/MailStream.cpp b/Net/src/MailStream.cpp index 89a43080b4..33362344a1 100644 --- a/Net/src/MailStream.cpp +++ b/Net/src/MailStream.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/MailStream.h" -namespace Poco { -namespace Net { +namespace Poco::Net { MailStreamBuf::MailStreamBuf(std::istream& istr): @@ -223,4 +222,4 @@ MailOutputStream::~MailOutputStream() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/MediaType.cpp b/Net/src/MediaType.cpp index a2fdb18fe0..24e4d12cc8 100644 --- a/Net/src/MediaType.cpp +++ b/Net/src/MediaType.cpp @@ -22,8 +22,7 @@ using Poco::icompare; -namespace Poco { -namespace Net { +namespace Poco::Net { MediaType::MediaType(const std::string& mediaType) @@ -207,4 +206,4 @@ void MediaType::parse(const std::string& mediaType) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/MessageHeader.cpp b/Net/src/MessageHeader.cpp index 94574bce08..2d6b956b4d 100644 --- a/Net/src/MessageHeader.cpp +++ b/Net/src/MessageHeader.cpp @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { MessageHeader::MessageHeader(): @@ -489,4 +488,4 @@ std::string MessageHeader::decodeWord(const std::string& text, const std::string } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/MulticastSocket.cpp b/Net/src/MulticastSocket.cpp index c761b77a6d..d98f76d156 100644 --- a/Net/src/MulticastSocket.cpp +++ b/Net/src/MulticastSocket.cpp @@ -42,8 +42,7 @@ struct ip_mreq #endif -namespace Poco { -namespace Net { +namespace Poco::Net { MulticastSocket::MulticastSocket() @@ -282,7 +281,7 @@ void MulticastSocket::leaveGroup(const IPAddress& groupAddress, const NetworkInt } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // POCO_NET_HAS_INTERFACE diff --git a/Net/src/MultipartReader.cpp b/Net/src/MultipartReader.cpp index 09d5cf746c..c6517ab954 100644 --- a/Net/src/MultipartReader.cpp +++ b/Net/src/MultipartReader.cpp @@ -21,8 +21,7 @@ using Poco::BufferedStreamBuf; -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -302,4 +301,4 @@ bool MultipartReader::readLine(std::string& line, std::string::size_type n) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/MultipartWriter.cpp b/Net/src/MultipartWriter.cpp index 831fae1071..6e29d6550a 100644 --- a/Net/src/MultipartWriter.cpp +++ b/Net/src/MultipartWriter.cpp @@ -22,8 +22,7 @@ using Poco::Random; using Poco::NumberFormatter; -namespace Poco { -namespace Net { +namespace Poco::Net { MultipartWriter::MultipartWriter(std::ostream& ostr): @@ -84,4 +83,4 @@ std::string MultipartWriter::createBoundary() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/NTLMCredentials.cpp b/Net/src/NTLMCredentials.cpp index bfe1beecc2..85e620e972 100644 --- a/Net/src/NTLMCredentials.cpp +++ b/Net/src/NTLMCredentials.cpp @@ -31,8 +31,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string NTLMCredentials::NTLMSSP("NTLMSSP"); @@ -377,4 +376,4 @@ std::vector NTLMCredentials::fromBase64(const std::string& base64 } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/NTPClient.cpp b/Net/src/NTPClient.cpp index 0a41b75ad8..942302b41a 100644 --- a/Net/src/NTPClient.cpp +++ b/Net/src/NTPClient.cpp @@ -22,8 +22,7 @@ using Poco::TimeoutException; -namespace Poco { -namespace Net { +namespace Poco::Net { NTPClient::NTPClient(IPAddress::Family family, int timeout): @@ -92,4 +91,4 @@ int NTPClient::request(SocketAddress& address) const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/NTPEventArgs.cpp b/Net/src/NTPEventArgs.cpp index c59f6eb44a..65285062fe 100644 --- a/Net/src/NTPEventArgs.cpp +++ b/Net/src/NTPEventArgs.cpp @@ -25,8 +25,7 @@ using Poco::IOException; using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { NTPEventArgs::NTPEventArgs(const SocketAddress& address): @@ -68,4 +67,4 @@ std::string NTPEventArgs::hostAddress() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/NTPPacket.cpp b/Net/src/NTPPacket.cpp index 3022c4af58..752a706739 100644 --- a/Net/src/NTPPacket.cpp +++ b/Net/src/NTPPacket.cpp @@ -18,8 +18,7 @@ #include "Poco/ByteOrder.h" -namespace Poco { -namespace Net { +namespace Poco::Net { #if !defined(POCO_COMPILER_SUN) @@ -156,4 +155,4 @@ Poco::Timestamp NTPPacket::convertTime(Poco::Int64 tm) const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/NameValueCollection.cpp b/Net/src/NameValueCollection.cpp index 4780aa7345..4b8de3f82b 100644 --- a/Net/src/NameValueCollection.cpp +++ b/Net/src/NameValueCollection.cpp @@ -21,8 +21,7 @@ using Poco::NotFoundException; -namespace Poco { -namespace Net { +namespace Poco::Net { NameValueCollection::NameValueCollection() @@ -171,4 +170,4 @@ void NameValueCollection::secureClear() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/Net.cpp b/Net/src/Net.cpp index 1a75379f14..68bc696d99 100644 --- a/Net/src/Net.cpp +++ b/Net/src/Net.cpp @@ -19,8 +19,7 @@ #include "Poco/Net/NetException.h" -namespace Poco { -namespace Net { +namespace Poco::Net { void Net_API initializeNetwork() @@ -62,7 +61,7 @@ std::string htmlize(const std::string& str) } -} } // namespace Poco::Net +} // namespace Poco::Net #if defined(POCO_OS_FAMILY_WINDOWS) && !defined(POCO_NO_AUTOMATIC_LIB_INIT) diff --git a/Net/src/NetException.cpp b/Net/src/NetException.cpp index 7ab1ae52b4..d93d697e10 100644 --- a/Net/src/NetException.cpp +++ b/Net/src/NetException.cpp @@ -19,8 +19,7 @@ using Poco::IOException; -namespace Poco { -namespace Net { +namespace Poco::Net { POCO_IMPLEMENT_EXCEPTION(NetException, IOException, "Net Exception") @@ -52,4 +51,4 @@ POCO_IMPLEMENT_EXCEPTION(UnsupportedFamilyException, NetException, "Unknown or u POCO_IMPLEMENT_EXCEPTION(AddressFamilyMismatchException, NetException, "Address family mismatch") -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp index b0137ed022..753c5db850 100644 --- a/Net/src/NetworkInterface.cpp +++ b/Net/src/NetworkInterface.cpp @@ -62,8 +62,7 @@ std::ostream& operator << (std::ostream& os, const Poco::Net::NetworkInterface:: } -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -923,7 +922,7 @@ NetworkInterface::List NetworkInterface::list(bool ipOnly, bool upOnly) } -} } // namespace Poco::Net +} // namespace Poco::Net // @@ -941,8 +940,7 @@ NetworkInterface::List NetworkInterface::list(bool ipOnly, bool upOnly) #include -namespace Poco { -namespace Net { +namespace Poco::Net { namespace { @@ -1242,7 +1240,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) } -} } // namespace Poco::Net +} // namespace Poco::Net #elif defined(POCO_VXWORKS) @@ -1253,8 +1251,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) #error TODO /* -namespace Poco { -namespace Net { +namespace Poco::Net { NetworkInterface::NetworkInterfaceList NetworkInterface::list() @@ -1297,7 +1294,7 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list() } -} } // namespace Poco::Net +} // namespace Poco::Net */ #elif defined(POCO_OS_FAMILY_BSD) || (POCO_OS == POCO_OS_QNX) || (POCO_OS == POCO_OS_SOLARIS) @@ -1314,8 +1311,7 @@ NetworkInterface::NetworkInterfaceList NetworkInterface::list() #endif -namespace Poco { -namespace Net { +namespace Poco::Net { namespace { @@ -1476,7 +1472,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) } -} } // namespace Poco::Net +} // namespace Poco::Net #elif POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_ANDROID @@ -1496,8 +1492,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) #include #include -namespace Poco { -namespace Net { +namespace Poco::Net { namespace { @@ -1702,7 +1697,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) } -} } // namespace Poco::Net +} // namespace Poco::Net #else diff --git a/Net/src/NullPartHandler.cpp b/Net/src/NullPartHandler.cpp index 49703a4050..4097eaeb0a 100644 --- a/Net/src/NullPartHandler.cpp +++ b/Net/src/NullPartHandler.cpp @@ -22,8 +22,7 @@ using Poco::NullOutputStream; using Poco::StreamCopier; -namespace Poco { -namespace Net { +namespace Poco::Net { NullPartHandler::NullPartHandler() @@ -43,4 +42,4 @@ void NullPartHandler::handlePart(const MessageHeader& header, std::istream& stre } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/OAuth10Credentials.cpp b/Net/src/OAuth10Credentials.cpp index cc077a036c..72e265cd55 100644 --- a/Net/src/OAuth10Credentials.cpp +++ b/Net/src/OAuth10Credentials.cpp @@ -30,8 +30,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string OAuth10Credentials::SCHEME = "OAuth"; @@ -362,4 +361,4 @@ std::string OAuth10Credentials::percentEncode(const std::string& str) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/OAuth20Credentials.cpp b/Net/src/OAuth20Credentials.cpp index 63e824b77a..9996f6ca22 100644 --- a/Net/src/OAuth20Credentials.cpp +++ b/Net/src/OAuth20Credentials.cpp @@ -18,8 +18,7 @@ #include "Poco/String.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string OAuth20Credentials::SCHEME = "Bearer"; @@ -102,4 +101,4 @@ void OAuth20Credentials::extractBearerToken(const HTTPRequest& request) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/POP3ClientSession.cpp b/Net/src/POP3ClientSession.cpp index 83ef3e7871..5dc64e5c76 100644 --- a/Net/src/POP3ClientSession.cpp +++ b/Net/src/POP3ClientSession.cpp @@ -28,8 +28,7 @@ using Poco::NumberFormatter; using Poco::StreamCopier; -namespace Poco { -namespace Net { +namespace Poco::Net { class DialogStreamBuf: public Poco::UnbufferedStreamBuf @@ -277,4 +276,4 @@ bool POP3ClientSession::isPositive(const std::string& response) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/PartHandler.cpp b/Net/src/PartHandler.cpp index 945cf318b5..38011562f8 100644 --- a/Net/src/PartHandler.cpp +++ b/Net/src/PartHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/PartHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { PartHandler::PartHandler() @@ -29,4 +28,4 @@ PartHandler::~PartHandler() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/PartSource.cpp b/Net/src/PartSource.cpp index 839668d70b..aaf932f6cf 100644 --- a/Net/src/PartSource.cpp +++ b/Net/src/PartSource.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/PartSource.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const int PartSource::UNKNOWN_CONTENT_LENGTH = -1; @@ -55,4 +54,4 @@ std::streamsize PartSource::getContentLength() const return UNKNOWN_CONTENT_LENGTH; } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/PartStore.cpp b/Net/src/PartStore.cpp index 3b0b0251d0..5cd180ac86 100644 --- a/Net/src/PartStore.cpp +++ b/Net/src/PartStore.cpp @@ -18,8 +18,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -84,4 +83,4 @@ const std::string& FilePartStore::path() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/PollSet.cpp b/Net/src/PollSet.cpp index 9a58793cff..4e9555538e 100644 --- a/Net/src/PollSet.cpp +++ b/Net/src/PollSet.cpp @@ -37,8 +37,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { #if defined(POCO_HAVE_FD_EPOLL) @@ -804,4 +803,4 @@ void PollSet::wakeUp() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/QuotedPrintableDecoder.cpp b/Net/src/QuotedPrintableDecoder.cpp index aff6e7ef10..04392b1252 100644 --- a/Net/src/QuotedPrintableDecoder.cpp +++ b/Net/src/QuotedPrintableDecoder.cpp @@ -23,8 +23,7 @@ using Poco::NumberParser; using Poco::DataFormatException; -namespace Poco { -namespace Net { +namespace Poco::Net { QuotedPrintableDecoderBuf::QuotedPrintableDecoderBuf(std::istream& istr): @@ -99,4 +98,4 @@ QuotedPrintableDecoder::~QuotedPrintableDecoder() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/QuotedPrintableEncoder.cpp b/Net/src/QuotedPrintableEncoder.cpp index eefef85bfa..7975e894d6 100644 --- a/Net/src/QuotedPrintableEncoder.cpp +++ b/Net/src/QuotedPrintableEncoder.cpp @@ -20,8 +20,7 @@ using Poco::UnbufferedStreamBuf; using Poco::NumberFormatter; -namespace Poco { -namespace Net { +namespace Poco::Net { QuotedPrintableEncoderBuf::QuotedPrintableEncoderBuf(std::ostream& ostr): @@ -147,4 +146,4 @@ QuotedPrintableEncoder::~QuotedPrintableEncoder() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/RawSocket.cpp b/Net/src/RawSocket.cpp index eb8689b27c..d2a387243f 100644 --- a/Net/src/RawSocket.cpp +++ b/Net/src/RawSocket.cpp @@ -20,8 +20,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { RawSocket::RawSocket(): @@ -156,4 +155,4 @@ int RawSocket::receiveFrom(void* buffer, int length, SocketAddress& address, int } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/RawSocketImpl.cpp b/Net/src/RawSocketImpl.cpp index bc9e4b685a..39e114d02b 100644 --- a/Net/src/RawSocketImpl.cpp +++ b/Net/src/RawSocketImpl.cpp @@ -19,8 +19,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { RawSocketImpl::RawSocketImpl() @@ -66,4 +65,4 @@ void RawSocketImpl::init2(int af, int proto) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/RemoteSyslogChannel.cpp b/Net/src/RemoteSyslogChannel.cpp index 2d526ae752..29a4d181f3 100644 --- a/Net/src/RemoteSyslogChannel.cpp +++ b/Net/src/RemoteSyslogChannel.cpp @@ -24,8 +24,7 @@ #include "Poco/String.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string RemoteSyslogChannel::BSD_TIMEFORMAT("%b %f %H:%M:%S"); @@ -426,4 +425,4 @@ void RemoteSyslogChannel::registerChannel() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/RemoteSyslogListener.cpp b/Net/src/RemoteSyslogListener.cpp index d1422e1a2c..1b92bbee28 100644 --- a/Net/src/RemoteSyslogListener.cpp +++ b/Net/src/RemoteSyslogListener.cpp @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -665,4 +664,4 @@ void RemoteSyslogListener::registerChannel() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SMTPChannel.cpp b/Net/src/SMTPChannel.cpp index 331732325e..ba78bf9ed0 100644 --- a/Net/src/SMTPChannel.cpp +++ b/Net/src/SMTPChannel.cpp @@ -29,8 +29,7 @@ #include "Poco/Environment.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string SMTPChannel::PROP_MAILHOST("mailhost"); @@ -207,4 +206,4 @@ void SMTPChannel::registerChannel() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SMTPClientSession.cpp b/Net/src/SMTPClientSession.cpp index 9bf6baca47..11f50dc6f6 100644 --- a/Net/src/SMTPClientSession.cpp +++ b/Net/src/SMTPClientSession.cpp @@ -47,8 +47,7 @@ using Poco::Base64Decoder; using Poco::Environment; -namespace Poco { -namespace Net { +namespace Poco::Net { SMTPClientSession::SMTPClientSession(const StreamSocket& socket): @@ -543,4 +542,4 @@ void SMTPClientSession::sendMessage(std::istream& istr) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SSPINTLMCredentials.cpp b/Net/src/SSPINTLMCredentials.cpp index 923a0cfb8e..5adeb28fee 100644 --- a/Net/src/SSPINTLMCredentials.cpp +++ b/Net/src/SSPINTLMCredentials.cpp @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { struct NTLMContextImpl @@ -235,14 +234,13 @@ SSPINTLMProvider& SSPINTLMProvider::instance() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // POCO_OS == POCO_OS_WINDOWS_NT -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string SSPINTLMCredentials::SERVICE_HTTP("HTTP"); @@ -311,4 +309,4 @@ std::vector SSPINTLMCredentials::authenticate(NTLMContext& contex } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ServerSocket.cpp b/Net/src/ServerSocket.cpp index 52dcf4c835..3792ab109f 100644 --- a/Net/src/ServerSocket.cpp +++ b/Net/src/ServerSocket.cpp @@ -20,8 +20,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { ServerSocket::ServerSocket(): Socket(new ServerSocketImpl) @@ -163,4 +162,4 @@ StreamSocket ServerSocket::acceptConnection() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/ServerSocketImpl.cpp b/Net/src/ServerSocketImpl.cpp index 7f6cd41bbf..0abe1e6f2b 100644 --- a/Net/src/ServerSocketImpl.cpp +++ b/Net/src/ServerSocketImpl.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/ServerSocketImpl.h" -namespace Poco { -namespace Net { +namespace Poco::Net { ServerSocketImpl::ServerSocketImpl() @@ -29,4 +28,4 @@ ServerSocketImpl::~ServerSocketImpl() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/Socket.cpp b/Net/src/Socket.cpp index b5c7a1db82..8b483ccdad 100644 --- a/Net/src/Socket.cpp +++ b/Net/src/Socket.cpp @@ -29,8 +29,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { Socket::Socket(): @@ -414,4 +413,4 @@ void Socket::error() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SocketAddress.cpp b/Net/src/SocketAddress.cpp index 864aa179e4..1351d59edc 100644 --- a/Net/src/SocketAddress.cpp +++ b/Net/src/SocketAddress.cpp @@ -40,8 +40,7 @@ using Poco::Net::Impl::LocalSocketAddressImpl; #endif -namespace Poco { -namespace Net { +namespace Poco::Net { struct AFLT @@ -475,6 +474,6 @@ std::ostream& operator << (std::ostream& ostr, const Poco::Net::SocketAddress& a } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SocketAddressImpl.cpp b/Net/src/SocketAddressImpl.cpp index d153b90418..d88c9eb109 100644 --- a/Net/src/SocketAddressImpl.cpp +++ b/Net/src/SocketAddressImpl.cpp @@ -18,9 +18,7 @@ #include -namespace Poco { -namespace Net { -namespace Impl { +namespace Poco::Net::Impl { // @@ -195,4 +193,4 @@ std::string LocalSocketAddressImpl::toString() const #endif // POCO_HAS_UNIX_SOCKET -} } } // namespace Poco::Net::Impl +} // namespace Poco::Net::Impl diff --git a/Net/src/SocketImpl.cpp b/Net/src/SocketImpl.cpp index 30671bbc04..429e725531 100644 --- a/Net/src/SocketImpl.cpp +++ b/Net/src/SocketImpl.cpp @@ -85,8 +85,7 @@ namespace { #endif // WEPOLL_H_ -namespace Poco { -namespace Net { +namespace Poco::Net { bool checkIsBrokenTimeout() @@ -1584,4 +1583,4 @@ std::streamsize SocketImpl::sendFileBlockwise(FileInputStream& fileInputStream, } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SocketNotification.cpp b/Net/src/SocketNotification.cpp index de859b5efa..b8805547b8 100644 --- a/Net/src/SocketNotification.cpp +++ b/Net/src/SocketNotification.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/SocketNotification.h" -namespace Poco { -namespace Net { +namespace Poco::Net { SocketNotification::SocketNotification(SocketReactor* pReactor): @@ -114,4 +113,4 @@ ShutdownNotification::~ShutdownNotification() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SocketNotifier.cpp b/Net/src/SocketNotifier.cpp index 4d41005477..4d9ac241fb 100644 --- a/Net/src/SocketNotifier.cpp +++ b/Net/src/SocketNotifier.cpp @@ -17,8 +17,7 @@ #include "Poco/Net/SocketNotification.h" -namespace Poco { -namespace Net { +namespace Poco::Net { SocketNotifier::SocketNotifier(const Socket& socket): @@ -94,4 +93,4 @@ void SocketNotifier::disableObservers() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SocketProactor.cpp b/Net/src/SocketProactor.cpp index 237eb50120..a841f03f19 100644 --- a/Net/src/SocketProactor.cpp +++ b/Net/src/SocketProactor.cpp @@ -29,8 +29,7 @@ using Poco::Exception; using Poco::ErrorHandler; -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -807,4 +806,4 @@ void SocketProactor::deleteHandler(IOHandlerList& handlers, IOHandlerList::itera } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SocketReactor.cpp b/Net/src/SocketReactor.cpp index a549d352de..5790b6fb9e 100644 --- a/Net/src/SocketReactor.cpp +++ b/Net/src/SocketReactor.cpp @@ -23,8 +23,7 @@ using Poco::Exception; using Poco::ErrorHandler; -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -361,4 +360,4 @@ ScopedSocketReactor::~ScopedSocketReactor() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/SocketStream.cpp b/Net/src/SocketStream.cpp index 3386866c26..5bfe2c5179 100644 --- a/Net/src/SocketStream.cpp +++ b/Net/src/SocketStream.cpp @@ -21,8 +21,7 @@ using Poco::BufferedBidirectionalStreamBuf; using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -153,4 +152,4 @@ SocketStream::~SocketStream() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/StreamSocket.cpp b/Net/src/StreamSocket.cpp index d71de4c23d..67f97b71ce 100644 --- a/Net/src/StreamSocket.cpp +++ b/Net/src/StreamSocket.cpp @@ -24,8 +24,7 @@ using Poco::Mutex; using Poco::ScopedLock; -namespace Poco { -namespace Net { +namespace Poco::Net { StreamSocket::StreamSocket(): Socket(new StreamSocketImpl) @@ -220,4 +219,4 @@ std::streamsize StreamSocket::sendFile(Poco::FileInputStream& fileInputStream, s } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/StreamSocketImpl.cpp b/Net/src/StreamSocketImpl.cpp index 2174f832d5..2abcafd64f 100644 --- a/Net/src/StreamSocketImpl.cpp +++ b/Net/src/StreamSocketImpl.cpp @@ -17,8 +17,7 @@ #include "Poco/Thread.h" -namespace Poco { -namespace Net { +namespace Poco::Net { StreamSocketImpl::StreamSocketImpl() @@ -74,4 +73,4 @@ int StreamSocketImpl::sendBytes(const void* buffer, int length, int flags) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/StringPartSource.cpp b/Net/src/StringPartSource.cpp index a63465c5b0..c973642714 100644 --- a/Net/src/StringPartSource.cpp +++ b/Net/src/StringPartSource.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/StringPartSource.h" -namespace Poco { -namespace Net { +namespace Poco::Net { StringPartSource::StringPartSource(const std::string& str): @@ -64,4 +63,4 @@ std::streamsize StringPartSource::getContentLength() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/TCPReactorAcceptor.cpp b/Net/src/TCPReactorAcceptor.cpp index 4eb332158d..698a5d2658 100644 --- a/Net/src/TCPReactorAcceptor.cpp +++ b/Net/src/TCPReactorAcceptor.cpp @@ -2,8 +2,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { TCPReactorAcceptor::TCPReactorAcceptor( @@ -55,5 +54,5 @@ TCPReactorServerConnection* TCPReactorAcceptor::createServiceHandler(Poco::Net:: return tmpConnPtr.get(); } -}} // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/TCPReactorServer.cpp b/Net/src/TCPReactorServer.cpp index 67123e3c40..bcbbaea388 100644 --- a/Net/src/TCPReactorServer.cpp +++ b/Net/src/TCPReactorServer.cpp @@ -3,8 +3,7 @@ #include "Poco/Net/TCPServerParams.h" #include "Poco/ThreadPool.h" -namespace Poco { -namespace Net { +namespace Poco::Net { @@ -53,5 +52,5 @@ void TCPReactorServer::stop() _threadPool.joinAll(); } -}} // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/TCPReactorServerConnection.cpp b/Net/src/TCPReactorServerConnection.cpp index 30228e1d79..30a80db3d7 100644 --- a/Net/src/TCPReactorServerConnection.cpp +++ b/Net/src/TCPReactorServerConnection.cpp @@ -1,8 +1,7 @@ #include "Poco/Net/TCPReactorServerConnection.h" #include "Poco/Net/HTTPObserver.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const int BUFFER_SIZE = 4096; @@ -80,5 +79,5 @@ void TCPReactorServerConnection::setRecvMessageCallback(const RecvMessageCallbac _rcvCallback = cb; } -}} // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/TCPServer.cpp b/Net/src/TCPServer.cpp index 9aea0f92b7..45f5e4482b 100644 --- a/Net/src/TCPServer.cpp +++ b/Net/src/TCPServer.cpp @@ -24,8 +24,7 @@ using Poco::ErrorHandler; -namespace Poco { -namespace Net { +namespace Poco::Net { // @@ -240,4 +239,4 @@ std::string TCPServer::threadName(const ServerSocket& socket) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/TCPServerConnection.cpp b/Net/src/TCPServerConnection.cpp index 1072b182c2..7f81574db2 100644 --- a/Net/src/TCPServerConnection.cpp +++ b/Net/src/TCPServerConnection.cpp @@ -21,8 +21,7 @@ using Poco::Exception; using Poco::ErrorHandler; -namespace Poco { -namespace Net { +namespace Poco::Net { TCPServerConnection::TCPServerConnection(const StreamSocket& socket): @@ -57,4 +56,4 @@ void TCPServerConnection::start() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/TCPServerConnectionFactory.cpp b/Net/src/TCPServerConnectionFactory.cpp index 3227e9bb00..164bf72ca9 100644 --- a/Net/src/TCPServerConnectionFactory.cpp +++ b/Net/src/TCPServerConnectionFactory.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/TCPServerConnectionFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { TCPServerConnectionFactory::TCPServerConnectionFactory(): @@ -30,4 +29,4 @@ TCPServerConnectionFactory::~TCPServerConnectionFactory() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/TCPServerDispatcher.cpp b/Net/src/TCPServerDispatcher.cpp index d77261377a..6993c46148 100644 --- a/Net/src/TCPServerDispatcher.cpp +++ b/Net/src/TCPServerDispatcher.cpp @@ -25,8 +25,7 @@ using Poco::FastMutex; using Poco::AutoPtr; -namespace Poco { -namespace Net { +namespace Poco::Net { class TCPConnectionNotification: public Notification @@ -245,4 +244,4 @@ void TCPServerDispatcher::endConnection() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/TCPServerParams.cpp b/Net/src/TCPServerParams.cpp index c50d1c0b1d..3176adfbee 100644 --- a/Net/src/TCPServerParams.cpp +++ b/Net/src/TCPServerParams.cpp @@ -16,8 +16,7 @@ #include "Poco/Bugcheck.h" -namespace Poco { -namespace Net { +namespace Poco::Net { TCPServerParams::TCPServerParams(): @@ -95,4 +94,4 @@ void TCPServerParams::setUseSelfReactor(bool useSelfReactor) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/UDPClient.cpp b/Net/src/UDPClient.cpp index 22716d15d3..daf0f2f496 100644 --- a/Net/src/UDPClient.cpp +++ b/Net/src/UDPClient.cpp @@ -16,8 +16,7 @@ #include "Poco/ErrorHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { UDPClient::UDPClient(const std::string& address, Poco::UInt16 port, bool listen): @@ -88,4 +87,4 @@ int UDPClient::handleResponse(char* buffer, int length) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/UDPServerParams.cpp b/Net/src/UDPServerParams.cpp index e7a0c6edcf..b65ed938c0 100644 --- a/Net/src/UDPServerParams.cpp +++ b/Net/src/UDPServerParams.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/UDPServerParams.h" -namespace Poco { -namespace Net { +namespace Poco::Net { UDPServerParams::UDPServerParams(const Poco::Net::SocketAddress& sa, @@ -39,4 +38,4 @@ UDPServerParams::~UDPServerParams() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/WebSocket.cpp b/Net/src/WebSocket.cpp index 320d5ff458..3c896a7c69 100644 --- a/Net/src/WebSocket.cpp +++ b/Net/src/WebSocket.cpp @@ -33,8 +33,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string WebSocket::WEBSOCKET_GUID("258EAFA5-E914-47DA-95CA-C5AB0DC85B11"); @@ -316,4 +315,4 @@ std::string WebSocket::computeAccept(const std::string& key) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/src/WebSocketImpl.cpp b/Net/src/WebSocketImpl.cpp index b4534147a6..d619752adb 100644 --- a/Net/src/WebSocketImpl.cpp +++ b/Net/src/WebSocketImpl.cpp @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { WebSocketImpl::WebSocketImpl(StreamSocketImpl* pStreamSocketImpl, HTTPSession& session, bool mustMaskPayload): @@ -686,4 +685,4 @@ int WebSocketImpl::available() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/Net/testsuite/src/FTPClientSessionTest.h b/Net/testsuite/src/FTPClientSessionTest.h index d3a058dd8e..0f73f9ba3e 100644 --- a/Net/testsuite/src/FTPClientSessionTest.h +++ b/Net/testsuite/src/FTPClientSessionTest.h @@ -18,12 +18,11 @@ #include "CppUnit/TestCase.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class FTPClientSession; -} } +} // namespace Poco::Net class DialogServer; diff --git a/Net/testsuite/src/SocketReactorTest.h b/Net/testsuite/src/SocketReactorTest.h index ad71b15b55..f241eae866 100644 --- a/Net/testsuite/src/SocketReactorTest.h +++ b/Net/testsuite/src/SocketReactorTest.h @@ -18,13 +18,12 @@ #include "CppUnit/TestCase.h" #include "Poco/AutoPtr.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class ReadableNotification; class WritableNotification; -} } +} // namespace Poco::Net class SocketReactorTest: public CppUnit::TestCase diff --git a/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h index b7495b3ca0..0a9a1484fa 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/AcceptCertificateHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/InvalidCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API AcceptCertificateHandler: public InvalidCertificateHandler @@ -46,7 +45,7 @@ class NetSSL_API AcceptCertificateHandler: public InvalidCertificateHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_AcceptCertificateHandler_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h index 0bfbe3e1c1..506152cc28 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h +++ b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactory.h @@ -21,8 +21,7 @@ #include "Poco/Net/NetSSL.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class InvalidCertificateHandler; @@ -81,7 +80,7 @@ class CertificateHandlerFactoryImpl: public Poco::Net::CertificateHandlerFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net // DEPRECATED: register the factory directly at the FactoryMgr: diff --git a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h index cf60851776..abb3666286 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h +++ b/NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API CertificateHandlerFactoryMgr @@ -58,7 +57,7 @@ class NetSSL_API CertificateHandlerFactoryMgr }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_CertificateHandlerFactoryMgr_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h index 35d2c92172..ef6ba7d711 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/ConsoleCertificateHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/InvalidCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API ConsoleCertificateHandler: public InvalidCertificateHandler @@ -44,7 +43,7 @@ class NetSSL_API ConsoleCertificateHandler: public InvalidCertificateHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_ConsoleCertificateHandler_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/Context.h b/NetSSL_OpenSSL/include/Poco/Net/Context.h index f3de7e9f43..55ac0c6026 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/Context.h +++ b/NetSSL_OpenSSL/include/Poco/Net/Context.h @@ -31,8 +31,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API Context: public Poco::RefCountedObject @@ -551,7 +550,7 @@ inline Context::InvalidCertificateHandlerPtr Context::getInvalidCertificateHandl } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_Context_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/FTPSClientSession.h b/NetSSL_OpenSSL/include/Poco/Net/FTPSClientSession.h index b9466c884f..a991108585 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/FTPSClientSession.h +++ b/NetSSL_OpenSSL/include/Poco/Net/FTPSClientSession.h @@ -23,8 +23,7 @@ #include "Poco/Net/FTPClientSession.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API FTPSClientSession: public Poco::Net::FTPClientSession @@ -105,7 +104,7 @@ inline void FTPSClientSession::forceSessionReuse(bool force) } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // #define NetSSL_FTPSClientSession_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/FTPSStreamFactory.h b/NetSSL_OpenSSL/include/Poco/Net/FTPSStreamFactory.h index af68dbd4c5..c80c7bcb3c 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/FTPSStreamFactory.h +++ b/NetSSL_OpenSSL/include/Poco/Net/FTPSStreamFactory.h @@ -23,8 +23,7 @@ #include "Poco/Net/FTPStreamFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API FTPSStreamFactory: public Poco::Net::FTPStreamFactory @@ -68,7 +67,7 @@ class NetSSL_API FTPSStreamFactory: public Poco::Net::FTPStreamFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_FTPSStreamFactory_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h index 03136c548f..f0c2fd1e73 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h +++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSClientSession.h @@ -26,8 +26,7 @@ #include "Poco/Net/X509Certificate.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class SecureStreamSocket; @@ -161,7 +160,7 @@ class NetSSL_API HTTPSClientSession: public HTTPClientSession }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSClientSession_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h index 214e2819b6..2b83027b9b 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h +++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSSessionInstantiator.h @@ -25,8 +25,7 @@ #include "Poco/URI.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API HTTPSSessionInstantiator: public HTTPSessionInstantiator @@ -59,7 +58,7 @@ class NetSSL_API HTTPSSessionInstantiator: public HTTPSessionInstantiator }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSSessionInstantiator_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h b/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h index 044cfdaedd..251937b4aa 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h +++ b/NetSSL_OpenSSL/include/Poco/Net/HTTPSStreamFactory.h @@ -23,8 +23,7 @@ #include "Poco/URIStreamFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API HTTPSStreamFactory: public Poco::URIStreamFactory @@ -77,7 +76,7 @@ class NetSSL_API HTTPSStreamFactory: public Poco::URIStreamFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSStreamFactory_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h index 8cf538e507..ae24cd17c5 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/InvalidCertificateHandler.h @@ -21,8 +21,7 @@ #include "Poco/Net/NetSSL.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class VerificationErrorArgs; @@ -76,7 +75,7 @@ class NetSSL_API InvalidCertificateHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_InvalidCertificateHandler_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h b/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h index d9483d78e0..0f14f4bb50 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/KeyConsoleHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/PrivateKeyPassphraseHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API KeyConsoleHandler: public PrivateKeyPassphraseHandler @@ -41,7 +40,7 @@ class NetSSL_API KeyConsoleHandler: public PrivateKeyPassphraseHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_KeyConsoleHandler_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h b/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h index 21e7a585ca..e35d30d001 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/KeyFileHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/PrivateKeyPassphraseHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API KeyFileHandler: public PrivateKeyPassphraseHandler @@ -45,7 +44,7 @@ class NetSSL_API KeyFileHandler: public PrivateKeyPassphraseHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_KeyFileHandler_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h index 444ab4b8c3..4558c46c92 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h +++ b/NetSSL_OpenSSL/include/Poco/Net/NetSSL.h @@ -62,8 +62,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { void NetSSL_API initializeSSL(); @@ -88,7 +87,7 @@ void NetSSL_API uninitializeSSL(); /// shutting down the SSLManager. -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_NetSSL_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h index 706a5992d4..4fa02b3fed 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h +++ b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactory.h @@ -21,8 +21,7 @@ #include "Poco/Net/NetSSL.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class PrivateKeyPassphraseHandler; @@ -83,7 +82,7 @@ class PrivateKeyFactoryImpl: public Poco::Net::PrivateKeyFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net // DEPRECATED: register the factory directly at the FactoryMgr: diff --git a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h index 3186ea0aa7..1c6c9b3bbb 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h +++ b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API PrivateKeyFactoryMgr @@ -58,7 +57,7 @@ class NetSSL_API PrivateKeyFactoryMgr }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_PrivateKeyFactoryMgr_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h index 350acf1218..ed2e6bc388 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/PrivateKeyPassphraseHandler.h @@ -21,8 +21,7 @@ #include "Poco/Net/NetSSL.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API PrivateKeyPassphraseHandler @@ -78,7 +77,7 @@ inline bool PrivateKeyPassphraseHandler::serverSide() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_PrivateKeyPassphraseHandler_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/RejectCertificateHandler.h b/NetSSL_OpenSSL/include/Poco/Net/RejectCertificateHandler.h index 7eff4459b7..26187648a6 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/RejectCertificateHandler.h +++ b/NetSSL_OpenSSL/include/Poco/Net/RejectCertificateHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/InvalidCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API RejectCertificateHandler: public InvalidCertificateHandler @@ -42,7 +41,7 @@ class NetSSL_API RejectCertificateHandler: public InvalidCertificateHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_RejectCertificateHandler_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/SSLException.h b/NetSSL_OpenSSL/include/Poco/Net/SSLException.h index 7b8dfe79d3..b8a1642f0e 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SSLException.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SSLException.h @@ -22,8 +22,7 @@ #include "Poco/Net/NetException.h" -namespace Poco { -namespace Net { +namespace Poco::Net { POCO_DECLARE_EXCEPTION(NetSSL_API, SSLException, NetException) @@ -33,7 +32,7 @@ POCO_DECLARE_EXCEPTION(NetSSL_API, CertificateValidationException, SSLException) POCO_DECLARE_EXCEPTION(NetSSL_API, SSLConnectionUnexpectedlyClosedException, SSLException) -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SSLException_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h b/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h index 9274d8b959..467b41af0b 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h @@ -34,8 +34,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { class Context; @@ -417,7 +416,7 @@ inline int SSLManager::socketIndex() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SSLManager_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureSMTPClientSession.h b/NetSSL_OpenSSL/include/Poco/Net/SecureSMTPClientSession.h index 06e6e6f0f8..ab74ae62e4 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureSMTPClientSession.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureSMTPClientSession.h @@ -23,8 +23,7 @@ #include "Poco/Net/Context.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API SecureSMTPClientSession: public SMTPClientSession @@ -87,7 +86,7 @@ class NetSSL_API SecureSMTPClientSession: public SMTPClientSession }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SecureSMTPClientSession_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h index 2ac8cdf71b..5996a75d03 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocket.h @@ -23,8 +23,7 @@ #include "Poco/Net/Context.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API SecureServerSocket: public ServerSocket @@ -130,7 +129,7 @@ class NetSSL_API SecureServerSocket: public ServerSocket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureServerSocket_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h index 00b29fc217..afbaabf7ff 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureServerSocketImpl.h @@ -24,8 +24,7 @@ #include "Poco/Net/Context.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API SecureServerSocketImpl: public ServerSocketImpl @@ -190,7 +189,7 @@ inline Context::Ptr SecureServerSocketImpl::context() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureServerSocketImpl_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h index 4764001fdc..4a5317793c 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HostEntry; @@ -336,7 +335,7 @@ inline const std::string& SecureSocketImpl::getPeerHostName() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureSocketImpl_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h index 4cafb482d2..24e4edbfd0 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h @@ -25,8 +25,7 @@ #include "Poco/Net/X509Certificate.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API SecureStreamSocket: public StreamSocket @@ -279,7 +278,7 @@ class NetSSL_API SecureStreamSocket: public StreamSocket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureStreamSocket_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h index 0833991660..1c06be1b6d 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h @@ -25,8 +25,7 @@ #include "Poco/Net/X509Certificate.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API SecureStreamSocketImpl: public StreamSocketImpl @@ -310,7 +309,7 @@ inline void SecureStreamSocketImpl::error(int code, const std::string& arg) } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureStreamSocketImpl_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/Session.h b/NetSSL_OpenSSL/include/Poco/Net/Session.h index 3ed5a4ec96..76fa45de19 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/Session.h +++ b/NetSSL_OpenSSL/include/Poco/Net/Session.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API Session: public Poco::RefCountedObject @@ -76,7 +75,7 @@ inline SSL_SESSION* Session::sslSession() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_Session_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/Utility.h b/NetSSL_OpenSSL/include/Poco/Net/Utility.h index b1d0073cfa..c2aa01ca12 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/Utility.h +++ b/NetSSL_OpenSSL/include/Poco/Net/Utility.h @@ -22,8 +22,7 @@ #include "Poco/Net/Context.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API Utility @@ -46,7 +45,7 @@ class NetSSL_API Utility }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_Utility_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h b/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h index 2503ae2849..8c035dce8a 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h +++ b/NetSSL_OpenSSL/include/Poco/Net/VerificationErrorArgs.h @@ -23,8 +23,7 @@ #include "Poco/Net/Context.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_API VerificationErrorArgs @@ -113,7 +112,7 @@ inline bool VerificationErrorArgs::getIgnoreError() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_VerificationErrorArgs_INCLUDED diff --git a/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h b/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h index 9651fefec9..8a00d6262b 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h +++ b/NetSSL_OpenSSL/include/Poco/Net/X509Certificate.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class HostEntry; @@ -108,7 +107,7 @@ class NetSSL_API X509Certificate: public Poco::Crypto::X509Certificate }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_X509Certificate_INCLUDED diff --git a/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp b/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp index 94d853c1b9..8426b00570 100644 --- a/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp +++ b/NetSSL_OpenSSL/src/AcceptCertificateHandler.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/VerificationErrorArgs.h" -namespace Poco { -namespace Net { +namespace Poco::Net { AcceptCertificateHandler::AcceptCertificateHandler(bool server): InvalidCertificateHandler(server) @@ -36,4 +35,4 @@ void AcceptCertificateHandler::onInvalidCertificate(const void*, VerificationErr } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp b/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp index 8c517748be..8902a01f16 100644 --- a/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp +++ b/NetSSL_OpenSSL/src/CertificateHandlerFactory.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/SSLManager.h" -namespace Poco { -namespace Net { +namespace Poco::Net { CertificateHandlerFactory::CertificateHandlerFactory() @@ -41,4 +40,4 @@ CertificateHandlerFactoryRegistrar::~CertificateHandlerFactoryRegistrar() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp b/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp index a84ab9d19a..87a8cf75a0 100644 --- a/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp +++ b/NetSSL_OpenSSL/src/CertificateHandlerFactoryMgr.cpp @@ -18,8 +18,7 @@ #include "Poco/Net/RejectCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { CertificateHandlerFactoryMgr::CertificateHandlerFactoryMgr() @@ -66,4 +65,4 @@ void CertificateHandlerFactoryMgr::removeFactory(const std::string& name) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp b/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp index 4fa1585c64..837edcbbb4 100644 --- a/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp +++ b/NetSSL_OpenSSL/src/ConsoleCertificateHandler.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { ConsoleCertificateHandler::ConsoleCertificateHandler(bool server): InvalidCertificateHandler(server) @@ -51,4 +50,4 @@ void ConsoleCertificateHandler::onInvalidCertificate(const void*, VerificationEr } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/Context.cpp b/NetSSL_OpenSSL/src/Context.cpp index b2117aef29..9f48b4d15f 100644 --- a/NetSSL_OpenSSL/src/Context.cpp +++ b/NetSSL_OpenSSL/src/Context.cpp @@ -35,8 +35,7 @@ #endif // OPENSSL_VERSION_NUMBER >= 0x30000000L -namespace Poco { -namespace Net { +namespace Poco::Net { Context::Params::Params(KeyDHGroup dhBits): @@ -921,4 +920,4 @@ void Context::initECDH(const std::string& curve) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/FTPSClientSession.cpp b/NetSSL_OpenSSL/src/FTPSClientSession.cpp index 18c4984c04..bebb7d258f 100644 --- a/NetSSL_OpenSSL/src/FTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/FTPSClientSession.cpp @@ -19,8 +19,7 @@ #include "Poco/Net/NetException.h" -namespace Poco { -namespace Net { +namespace Poco::Net { FTPSClientSession::FTPSClientSession(): @@ -148,4 +147,4 @@ void FTPSClientSession::receiveServerReadyReply() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/FTPSStreamFactory.cpp b/NetSSL_OpenSSL/src/FTPSStreamFactory.cpp index fa0ec66f10..cefb1736fd 100644 --- a/NetSSL_OpenSSL/src/FTPSStreamFactory.cpp +++ b/NetSSL_OpenSSL/src/FTPSStreamFactory.cpp @@ -28,8 +28,7 @@ using Poco::UnbufferedStreamBuf; using Poco::Path; -namespace Poco { -namespace Net { +namespace Poco::Net { class FTPSStreamBuf: public UnbufferedStreamBuf @@ -158,4 +157,4 @@ void FTPSStreamFactory::unregisterFactory() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp index faec2e4208..d487d39bbe 100644 --- a/NetSSL_OpenSSL/src/HTTPSClientSession.cpp +++ b/NetSSL_OpenSSL/src/HTTPSClientSession.cpp @@ -27,8 +27,7 @@ using Poco::NumberFormatter; using Poco::IllegalStateException; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSClientSession::HTTPSClientSession(): @@ -187,4 +186,4 @@ Session::Ptr HTTPSClientSession::sslSession() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp b/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp index 4a2f3c5b28..04d21d68da 100644 --- a/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp +++ b/NetSSL_OpenSSL/src/HTTPSSessionInstantiator.cpp @@ -17,8 +17,7 @@ #include "Poco/Net/HTTPSClientSession.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSSessionInstantiator::HTTPSSessionInstantiator() @@ -67,4 +66,4 @@ void HTTPSSessionInstantiator::unregisterInstantiator() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp b/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp index 92b9305232..ee91627465 100644 --- a/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp +++ b/NetSSL_OpenSSL/src/HTTPSStreamFactory.cpp @@ -34,8 +34,7 @@ using Poco::URIStreamOpener; using Poco::UnbufferedStreamBuf; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSStreamFactory::HTTPSStreamFactory(): @@ -191,4 +190,4 @@ void HTTPSStreamFactory::unregisterFactory() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp b/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp index 3afd6a9bc6..769b75c672 100644 --- a/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp +++ b/NetSSL_OpenSSL/src/InvalidCertificateHandler.cpp @@ -20,8 +20,7 @@ using Poco::Delegate; -namespace Poco { -namespace Net { +namespace Poco::Net { InvalidCertificateHandler::InvalidCertificateHandler(bool handleErrorsOnServerSide): _handleErrorsOnServerSide(handleErrorsOnServerSide) @@ -34,4 +33,4 @@ InvalidCertificateHandler::~InvalidCertificateHandler() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp b/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp index 66de05db50..9e33e8409f 100644 --- a/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp +++ b/NetSSL_OpenSSL/src/KeyConsoleHandler.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { KeyConsoleHandler::KeyConsoleHandler(bool server):PrivateKeyPassphraseHandler(server) @@ -37,4 +36,4 @@ void KeyConsoleHandler::onPrivateKeyRequested(const void* pSender, std::string& } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/KeyFileHandler.cpp b/NetSSL_OpenSSL/src/KeyFileHandler.cpp index 349cf664d8..978a3ab76b 100644 --- a/NetSSL_OpenSSL/src/KeyFileHandler.cpp +++ b/NetSSL_OpenSSL/src/KeyFileHandler.cpp @@ -20,8 +20,7 @@ #include "Poco/Util/OptionException.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string KeyFileHandler::CFG_PRIV_KEY_FILE("privateKeyPassphraseHandler.options.password"); @@ -58,4 +57,4 @@ void KeyFileHandler::onPrivateKeyRequested(const void* pSender, std::string& pri } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp b/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp index 90297c351e..58895c8f50 100644 --- a/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp +++ b/NetSSL_OpenSSL/src/PrivateKeyFactory.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/SSLManager.h" -namespace Poco { -namespace Net { +namespace Poco::Net { PrivateKeyFactory::PrivateKeyFactory() @@ -41,4 +40,4 @@ PrivateKeyFactoryRegistrar::~PrivateKeyFactoryRegistrar() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp b/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp index abd6530c36..13c381e12c 100644 --- a/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp +++ b/NetSSL_OpenSSL/src/PrivateKeyFactoryMgr.cpp @@ -17,8 +17,7 @@ #include "Poco/Net/KeyConsoleHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { PrivateKeyFactoryMgr::PrivateKeyFactoryMgr() @@ -64,4 +63,4 @@ void PrivateKeyFactoryMgr::removeFactory(const std::string& name) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp b/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp index 9c1386c74c..b29ada7256 100644 --- a/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp +++ b/NetSSL_OpenSSL/src/PrivateKeyPassphraseHandler.cpp @@ -20,8 +20,7 @@ using Poco::Delegate; -namespace Poco { -namespace Net { +namespace Poco::Net { PrivateKeyPassphraseHandler::PrivateKeyPassphraseHandler(bool onServerSide): _serverSide(onServerSide) @@ -43,4 +42,4 @@ PrivateKeyPassphraseHandler::~PrivateKeyPassphraseHandler() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/RejectCertificateHandler.cpp b/NetSSL_OpenSSL/src/RejectCertificateHandler.cpp index cc2a39ffc7..9be8c4c972 100644 --- a/NetSSL_OpenSSL/src/RejectCertificateHandler.cpp +++ b/NetSSL_OpenSSL/src/RejectCertificateHandler.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/VerificationErrorArgs.h" -namespace Poco { -namespace Net { +namespace Poco::Net { RejectCertificateHandler::RejectCertificateHandler(bool server): InvalidCertificateHandler(server) @@ -36,4 +35,4 @@ void RejectCertificateHandler::onInvalidCertificate(const void*, VerificationErr } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/SSLException.cpp b/NetSSL_OpenSSL/src/SSLException.cpp index 2b64d2a4d6..370f792f80 100644 --- a/NetSSL_OpenSSL/src/SSLException.cpp +++ b/NetSSL_OpenSSL/src/SSLException.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { POCO_IMPLEMENT_EXCEPTION(SSLException, NetException, "SSL Exception") @@ -27,4 +26,4 @@ POCO_IMPLEMENT_EXCEPTION(CertificateValidationException, SSLException, "Certific POCO_IMPLEMENT_EXCEPTION(SSLConnectionUnexpectedlyClosedException, SSLException, "SSL connection unexpectedly closed") -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/SSLManager.cpp b/NetSSL_OpenSSL/src/SSLManager.cpp index 63996c3bf6..e2b368c9ac 100644 --- a/NetSSL_OpenSSL/src/SSLManager.cpp +++ b/NetSSL_OpenSSL/src/SSLManager.cpp @@ -34,8 +34,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string SSLManager::CFG_PRIV_KEY_FILE("privateKeyFile"); @@ -640,4 +639,4 @@ void uninitializeSSL() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp b/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp index 74ec2e4d0b..590fbc6a02 100644 --- a/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp +++ b/NetSSL_OpenSSL/src/SecureSMTPClientSession.cpp @@ -18,8 +18,7 @@ #include "Poco/Net/DialogSocket.h" -namespace Poco { -namespace Net { +namespace Poco::Net { SecureSMTPClientSession::SecureSMTPClientSession(const StreamSocket& socket): @@ -60,4 +59,4 @@ bool SecureSMTPClientSession::startTLS(Context::Ptr pContext) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/SecureServerSocket.cpp b/NetSSL_OpenSSL/src/SecureServerSocket.cpp index 66bf09679c..36c5907068 100644 --- a/NetSSL_OpenSSL/src/SecureServerSocket.cpp +++ b/NetSSL_OpenSSL/src/SecureServerSocket.cpp @@ -22,8 +22,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { SecureServerSocket::SecureServerSocket(): @@ -118,4 +117,4 @@ Context::Ptr SecureServerSocket::context() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp index 64c8182cfb..2ea0334fa6 100644 --- a/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureServerSocketImpl.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/SecureServerSocketImpl.h" -namespace Poco { -namespace Net { +namespace Poco::Net { SecureServerSocketImpl::SecureServerSocketImpl(Context::Ptr pContext): @@ -140,4 +139,4 @@ bool SecureServerSocketImpl::secure() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp index 8fed8b0193..22b4337e19 100644 --- a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp @@ -35,8 +35,7 @@ using Poco::NumberFormatter; using Poco::Timespan; -namespace Poco { -namespace Net { +namespace Poco::Net { SecureSocketImpl::SecureSocketImpl(Poco::AutoPtr pSocketImpl, Context::Ptr pContext): @@ -675,4 +674,4 @@ int SecureSocketImpl::onSessionCreated(SSL* pSSL, SSL_SESSION* pSession) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp index 94447379dd..6c00c77cd1 100644 --- a/NetSSL_OpenSSL/src/SecureStreamSocket.cpp +++ b/NetSSL_OpenSSL/src/SecureStreamSocket.cpp @@ -22,8 +22,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { SecureStreamSocket::SecureStreamSocket(): @@ -298,4 +297,4 @@ void SecureStreamSocket::abort() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp index 3523831e88..522ad29103 100644 --- a/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureStreamSocketImpl.cpp @@ -17,8 +17,7 @@ #include "Poco/Thread.h" -namespace Poco { -namespace Net { +namespace Poco::Net { SecureStreamSocketImpl::SecureStreamSocketImpl(Context::Ptr pContext): @@ -250,4 +249,4 @@ void SecureStreamSocketImpl::getRawOption(int level, int option, void* value, po } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/Session.cpp b/NetSSL_OpenSSL/src/Session.cpp index c84ee9d261..2c9fa20582 100644 --- a/NetSSL_OpenSSL/src/Session.cpp +++ b/NetSSL_OpenSSL/src/Session.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { Session::Session(SSL_SESSION* pSession): @@ -42,4 +41,4 @@ bool Session::isResumable() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/Utility.cpp b/NetSSL_OpenSSL/src/Utility.cpp index 7aec48bd9d..092d73ca63 100644 --- a/NetSSL_OpenSSL/src/Utility.cpp +++ b/NetSSL_OpenSSL/src/Utility.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { Context::VerificationMode Utility::convertVerificationMode(const std::string& vMode) @@ -64,4 +63,4 @@ void Utility::clearErrorStack() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp b/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp index 8c4f7d8126..ee0722c33e 100644 --- a/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp +++ b/NetSSL_OpenSSL/src/VerificationErrorArgs.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/VerificationErrorArgs.h" -namespace Poco { -namespace Net { +namespace Poco::Net { VerificationErrorArgs::VerificationErrorArgs(Poco::Net::Context::Ptr pContext, const X509Certificate& cert, int errDepth, int errNum, const std::string& errMsg): @@ -35,4 +34,4 @@ VerificationErrorArgs::~VerificationErrorArgs() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/src/X509Certificate.cpp b/NetSSL_OpenSSL/src/X509Certificate.cpp index 16b94efbfe..60d5b18eac 100644 --- a/NetSSL_OpenSSL/src/X509Certificate.cpp +++ b/NetSSL_OpenSSL/src/X509Certificate.cpp @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { X509Certificate::X509Certificate(std::istream& istr): @@ -199,4 +198,4 @@ bool X509Certificate::matchWildcard(const std::string& wildcard, const std::stri } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_OpenSSL/testsuite/src/FTPSClientSessionTest.h b/NetSSL_OpenSSL/testsuite/src/FTPSClientSessionTest.h index d18a8ac794..baa6c2b0e9 100644 --- a/NetSSL_OpenSSL/testsuite/src/FTPSClientSessionTest.h +++ b/NetSSL_OpenSSL/testsuite/src/FTPSClientSessionTest.h @@ -18,12 +18,11 @@ #include "CppUnit/TestCase.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class FTPSClientSession; -} } +} // namespace Poco::Net class DialogServer; diff --git a/NetSSL_Win/include/Poco/Net/AcceptCertificateHandler.h b/NetSSL_Win/include/Poco/Net/AcceptCertificateHandler.h index 775d160732..d39aadd6c4 100644 --- a/NetSSL_Win/include/Poco/Net/AcceptCertificateHandler.h +++ b/NetSSL_Win/include/Poco/Net/AcceptCertificateHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/InvalidCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API AcceptCertificateHandler: public InvalidCertificateHandler @@ -46,7 +45,7 @@ class NetSSL_Win_API AcceptCertificateHandler: public InvalidCertificateHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_AcceptCertificateHandler_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h b/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h index d7b37df747..822fa1f241 100644 --- a/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h +++ b/NetSSL_Win/include/Poco/Net/AutoSecBufferDesc.h @@ -29,8 +29,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { template @@ -163,7 +162,7 @@ class AutoSecBufferDesc: public SecBufferDesc }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_AutoSecBufferDesc_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h index 954b1ecf5d..3cf49a724c 100644 --- a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h +++ b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactory.h @@ -21,8 +21,7 @@ #include "Poco/Net/NetSSL.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class InvalidCertificateHandler; @@ -81,7 +80,7 @@ class CertificateHandlerFactoryImpl: public Poco::Net::CertificateHandlerFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net // DEPRECATED: register the factory directly at the FactoryMgr: diff --git a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactoryMgr.h b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactoryMgr.h index 6c1ca3ac18..91d279dfa7 100644 --- a/NetSSL_Win/include/Poco/Net/CertificateHandlerFactoryMgr.h +++ b/NetSSL_Win/include/Poco/Net/CertificateHandlerFactoryMgr.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API CertificateHandlerFactoryMgr @@ -58,7 +57,7 @@ class NetSSL_Win_API CertificateHandlerFactoryMgr }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_CertificateHandlerFactoryMgr_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/ConsoleCertificateHandler.h b/NetSSL_Win/include/Poco/Net/ConsoleCertificateHandler.h index 2642760210..4ff0e40413 100644 --- a/NetSSL_Win/include/Poco/Net/ConsoleCertificateHandler.h +++ b/NetSSL_Win/include/Poco/Net/ConsoleCertificateHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/InvalidCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API ConsoleCertificateHandler: public InvalidCertificateHandler @@ -44,7 +43,7 @@ class NetSSL_Win_API ConsoleCertificateHandler: public InvalidCertificateHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_ConsoleCertificateHandler_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/Context.h b/NetSSL_Win/include/Poco/Net/Context.h index 828cd86e95..3b9cdd4adc 100644 --- a/NetSSL_Win/include/Poco/Net/Context.h +++ b/NetSSL_Win/include/Poco/Net/Context.h @@ -36,8 +36,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API Context: public Poco::RefCountedObject @@ -306,7 +305,7 @@ inline HCERTSTORE Context::certificateStore() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_Context_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h b/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h index 0aa66e2fcb..e12b5166ee 100644 --- a/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h +++ b/NetSSL_Win/include/Poco/Net/HTTPSClientSession.h @@ -26,8 +26,7 @@ #include "Poco/Net/X509Certificate.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class SecureStreamSocket; @@ -159,7 +158,7 @@ class NetSSL_Win_API HTTPSClientSession: public HTTPClientSession }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSClientSession_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/HTTPSSessionInstantiator.h b/NetSSL_Win/include/Poco/Net/HTTPSSessionInstantiator.h index c8ad1307c6..8ecec137bf 100644 --- a/NetSSL_Win/include/Poco/Net/HTTPSSessionInstantiator.h +++ b/NetSSL_Win/include/Poco/Net/HTTPSSessionInstantiator.h @@ -25,8 +25,7 @@ #include "Poco/URI.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API HTTPSSessionInstantiator: public HTTPSessionInstantiator @@ -59,7 +58,7 @@ class NetSSL_Win_API HTTPSSessionInstantiator: public HTTPSessionInstantiator }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSSessionInstantiator_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/HTTPSStreamFactory.h b/NetSSL_Win/include/Poco/Net/HTTPSStreamFactory.h index 7c1a3c1cc4..3b341cdc08 100644 --- a/NetSSL_Win/include/Poco/Net/HTTPSStreamFactory.h +++ b/NetSSL_Win/include/Poco/Net/HTTPSStreamFactory.h @@ -23,8 +23,7 @@ #include "Poco/URIStreamFactory.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API HTTPSStreamFactory: public Poco::URIStreamFactory @@ -77,7 +76,7 @@ class NetSSL_Win_API HTTPSStreamFactory: public Poco::URIStreamFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_HTTPSStreamFactory_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h b/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h index 6c16f8bb5c..004f8c075d 100644 --- a/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h +++ b/NetSSL_Win/include/Poco/Net/InvalidCertificateHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/VerificationErrorArgs.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API InvalidCertificateHandler @@ -74,7 +73,7 @@ class NetSSL_Win_API InvalidCertificateHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_InvalidCertificateHandler_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/KeyConsoleHandler.h b/NetSSL_Win/include/Poco/Net/KeyConsoleHandler.h index 2c09eb9eb5..f7d4dc6950 100644 --- a/NetSSL_Win/include/Poco/Net/KeyConsoleHandler.h +++ b/NetSSL_Win/include/Poco/Net/KeyConsoleHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/PrivateKeyPassphraseHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API KeyConsoleHandler: public PrivateKeyPassphraseHandler @@ -41,7 +40,7 @@ class NetSSL_Win_API KeyConsoleHandler: public PrivateKeyPassphraseHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_KeyConsoleHandler_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/KeyFileHandler.h b/NetSSL_Win/include/Poco/Net/KeyFileHandler.h index af33ff1fc2..934cb51d82 100644 --- a/NetSSL_Win/include/Poco/Net/KeyFileHandler.h +++ b/NetSSL_Win/include/Poco/Net/KeyFileHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/PrivateKeyPassphraseHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API KeyFileHandler: public PrivateKeyPassphraseHandler @@ -45,7 +44,7 @@ class NetSSL_Win_API KeyFileHandler: public PrivateKeyPassphraseHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_KeyFileHandler_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/NetSSL.h b/NetSSL_Win/include/Poco/Net/NetSSL.h index 3abaa6444a..0a99cbc934 100644 --- a/NetSSL_Win/include/Poco/Net/NetSSL.h +++ b/NetSSL_Win/include/Poco/Net/NetSSL.h @@ -65,8 +65,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { void NetSSL_Win_API initializeSSL(); @@ -83,7 +82,7 @@ void NetSSL_Win_API uninitializeSSL(); /// shutting down the SSLManager. -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_NetSSL_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h b/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h index 5210da3adb..49fb1ff00e 100644 --- a/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h +++ b/NetSSL_Win/include/Poco/Net/PrivateKeyFactory.h @@ -21,8 +21,7 @@ #include "Poco/Net/NetSSL.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class PrivateKeyPassphraseHandler; @@ -83,7 +82,7 @@ class PrivateKeyFactoryImpl: public Poco::Net::PrivateKeyFactory }; -} } // namespace Poco::Net +} // namespace Poco::Net // DEPRECATED: register the factory directly at the FactoryMgr: diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h b/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h index a3ed0d30b7..34d5d58be9 100644 --- a/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h +++ b/NetSSL_Win/include/Poco/Net/PrivateKeyFactoryMgr.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API PrivateKeyFactoryMgr @@ -58,7 +57,7 @@ class NetSSL_Win_API PrivateKeyFactoryMgr }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_PrivateKeyFactoryMgr_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h b/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h index 2b9d6a0a57..ba33394a03 100644 --- a/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h +++ b/NetSSL_Win/include/Poco/Net/PrivateKeyPassphraseHandler.h @@ -21,8 +21,7 @@ #include "Poco/Net/NetSSL.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API PrivateKeyPassphraseHandler @@ -78,7 +77,7 @@ inline bool PrivateKeyPassphraseHandler::serverSide() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_PrivateKeyPassphraseHandler_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/RejectCertificateHandler.h b/NetSSL_Win/include/Poco/Net/RejectCertificateHandler.h index 32eba4e7b0..5558a2f0a3 100644 --- a/NetSSL_Win/include/Poco/Net/RejectCertificateHandler.h +++ b/NetSSL_Win/include/Poco/Net/RejectCertificateHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/InvalidCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API RejectCertificateHandler: public InvalidCertificateHandler @@ -42,7 +41,7 @@ class NetSSL_Win_API RejectCertificateHandler: public InvalidCertificateHandler }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_RejectCertificateHandler_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/SSLException.h b/NetSSL_Win/include/Poco/Net/SSLException.h index 69d3192e09..9df66cd048 100644 --- a/NetSSL_Win/include/Poco/Net/SSLException.h +++ b/NetSSL_Win/include/Poco/Net/SSLException.h @@ -22,8 +22,7 @@ #include "Poco/Net/NetException.h" -namespace Poco { -namespace Net { +namespace Poco::Net { POCO_DECLARE_EXCEPTION(NetSSL_Win_API, SSLException, NetException) @@ -35,7 +34,7 @@ POCO_DECLARE_EXCEPTION(NetSSL_Win_API, CertificateValidationException, Certifica POCO_DECLARE_EXCEPTION(NetSSL_Win_API, SSLConnectionUnexpectedlyClosedException, SSLException) -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SSLException_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/SSLManager.h b/NetSSL_Win/include/Poco/Net/SSLManager.h index 8f382c833d..d0421c5231 100644 --- a/NetSSL_Win/include/Poco/Net/SSLManager.h +++ b/NetSSL_Win/include/Poco/Net/SSLManager.h @@ -38,8 +38,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { class Context; @@ -327,7 +326,7 @@ inline SecurityFunctionTableW& SSLManager::securityFunctions() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SSLManager_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h b/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h index 78441e10ce..12e0801304 100644 --- a/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h +++ b/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h @@ -23,8 +23,7 @@ #include "Poco/Net/Context.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API SecureSMTPClientSession: public SMTPClientSession @@ -87,7 +86,7 @@ class NetSSL_Win_API SecureSMTPClientSession: public SMTPClientSession }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // Net_SecureSMTPClientSession_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/SecureServerSocket.h b/NetSSL_Win/include/Poco/Net/SecureServerSocket.h index 0ededfa640..8f67da4b58 100644 --- a/NetSSL_Win/include/Poco/Net/SecureServerSocket.h +++ b/NetSSL_Win/include/Poco/Net/SecureServerSocket.h @@ -23,8 +23,7 @@ #include "Poco/Net/Context.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API SecureServerSocket: public ServerSocket @@ -130,7 +129,7 @@ class NetSSL_Win_API SecureServerSocket: public ServerSocket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureServerSocket_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/SecureServerSocketImpl.h b/NetSSL_Win/include/Poco/Net/SecureServerSocketImpl.h index 32555fa454..ada788589a 100644 --- a/NetSSL_Win/include/Poco/Net/SecureServerSocketImpl.h +++ b/NetSSL_Win/include/Poco/Net/SecureServerSocketImpl.h @@ -24,8 +24,7 @@ #include "Poco/Net/Context.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API SecureServerSocketImpl: public ServerSocketImpl @@ -190,7 +189,7 @@ inline Context::Ptr SecureServerSocketImpl::context() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureServerSocketImpl_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/SecureSocketImpl.h b/NetSSL_Win/include/Poco/Net/SecureSocketImpl.h index cd0de1f025..d38fe405a7 100644 --- a/NetSSL_Win/include/Poco/Net/SecureSocketImpl.h +++ b/NetSSL_Win/include/Poco/Net/SecureSocketImpl.h @@ -47,8 +47,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API SecureSocketImpl @@ -429,7 +428,7 @@ inline int SecureSocketImpl::lastError() } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureSocketImpl_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/SecureStreamSocket.h b/NetSSL_Win/include/Poco/Net/SecureStreamSocket.h index 2484a9f76e..a6271b3a9f 100644 --- a/NetSSL_Win/include/Poco/Net/SecureStreamSocket.h +++ b/NetSSL_Win/include/Poco/Net/SecureStreamSocket.h @@ -25,8 +25,7 @@ #include "Poco/Net/X509Certificate.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API SecureStreamSocket: public StreamSocket @@ -267,7 +266,7 @@ class NetSSL_Win_API SecureStreamSocket: public StreamSocket }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureStreamSocket_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/SecureStreamSocketImpl.h b/NetSSL_Win/include/Poco/Net/SecureStreamSocketImpl.h index ea56c2723e..1d8490e739 100644 --- a/NetSSL_Win/include/Poco/Net/SecureStreamSocketImpl.h +++ b/NetSSL_Win/include/Poco/Net/SecureStreamSocketImpl.h @@ -26,8 +26,7 @@ #include "Poco/Net/X509Certificate.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API SecureStreamSocketImpl: public StreamSocketImpl @@ -311,7 +310,7 @@ inline void SecureStreamSocketImpl::error(int code, const std::string& arg) } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_SecureStreamSocketImpl_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/Session.h b/NetSSL_Win/include/Poco/Net/Session.h index e96ba3de3a..6187051225 100644 --- a/NetSSL_Win/include/Poco/Net/Session.h +++ b/NetSSL_Win/include/Poco/Net/Session.h @@ -23,8 +23,7 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API Session: public Poco::RefCountedObject @@ -61,7 +60,7 @@ class NetSSL_Win_API Session: public Poco::RefCountedObject // -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_Session_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/Utility.h b/NetSSL_Win/include/Poco/Net/Utility.h index 7a3501fd78..63ecb2459c 100644 --- a/NetSSL_Win/include/Poco/Net/Utility.h +++ b/NetSSL_Win/include/Poco/Net/Utility.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API Utility @@ -44,7 +43,7 @@ class NetSSL_Win_API Utility }; -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_Utility_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/VerificationErrorArgs.h b/NetSSL_Win/include/Poco/Net/VerificationErrorArgs.h index bf3bc4793a..abe098238e 100644 --- a/NetSSL_Win/include/Poco/Net/VerificationErrorArgs.h +++ b/NetSSL_Win/include/Poco/Net/VerificationErrorArgs.h @@ -22,8 +22,7 @@ #include "Poco/Net/X509Certificate.h" -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API VerificationErrorArgs @@ -102,7 +101,7 @@ inline bool VerificationErrorArgs::getIgnoreError() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_VerificationErrorArgs_INCLUDED diff --git a/NetSSL_Win/include/Poco/Net/X509Certificate.h b/NetSSL_Win/include/Poco/Net/X509Certificate.h index e5efd82810..b0ab1b9b9d 100644 --- a/NetSSL_Win/include/Poco/Net/X509Certificate.h +++ b/NetSSL_Win/include/Poco/Net/X509Certificate.h @@ -27,8 +27,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { class NetSSL_Win_API X509Certificate @@ -198,7 +197,7 @@ inline const PCCERT_CONTEXT X509Certificate::system() const } -} } // namespace Poco::Net +} // namespace Poco::Net #endif // NetSSL_X509Certificate_INCLUDED diff --git a/NetSSL_Win/src/AcceptCertificateHandler.cpp b/NetSSL_Win/src/AcceptCertificateHandler.cpp index 99e09d8003..f8150c6a7e 100644 --- a/NetSSL_Win/src/AcceptCertificateHandler.cpp +++ b/NetSSL_Win/src/AcceptCertificateHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/AcceptCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { AcceptCertificateHandler::AcceptCertificateHandler(bool server): InvalidCertificateHandler(server) @@ -35,4 +34,4 @@ void AcceptCertificateHandler::onInvalidCertificate(const void*, VerificationErr } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/CertificateHandlerFactory.cpp b/NetSSL_Win/src/CertificateHandlerFactory.cpp index 190490026a..1fdfe0e7f2 100644 --- a/NetSSL_Win/src/CertificateHandlerFactory.cpp +++ b/NetSSL_Win/src/CertificateHandlerFactory.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/SSLManager.h" -namespace Poco { -namespace Net { +namespace Poco::Net { CertificateHandlerFactory::CertificateHandlerFactory() @@ -41,4 +40,4 @@ CertificateHandlerFactoryRegistrar::~CertificateHandlerFactoryRegistrar() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/CertificateHandlerFactoryMgr.cpp b/NetSSL_Win/src/CertificateHandlerFactoryMgr.cpp index 4572eecace..44419772d1 100644 --- a/NetSSL_Win/src/CertificateHandlerFactoryMgr.cpp +++ b/NetSSL_Win/src/CertificateHandlerFactoryMgr.cpp @@ -18,8 +18,7 @@ #include "Poco/Net/RejectCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { CertificateHandlerFactoryMgr::CertificateHandlerFactoryMgr() @@ -66,4 +65,4 @@ void CertificateHandlerFactoryMgr::removeFactory(const std::string& name) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/ConsoleCertificateHandler.cpp b/NetSSL_Win/src/ConsoleCertificateHandler.cpp index 09e836a362..338444a545 100644 --- a/NetSSL_Win/src/ConsoleCertificateHandler.cpp +++ b/NetSSL_Win/src/ConsoleCertificateHandler.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { ConsoleCertificateHandler::ConsoleCertificateHandler(bool server): InvalidCertificateHandler(server) @@ -50,4 +49,4 @@ void ConsoleCertificateHandler::onInvalidCertificate(const void*, VerificationEr } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/Context.cpp b/NetSSL_Win/src/Context.cpp index cd729b2d03..6d124dcbfc 100644 --- a/NetSSL_Win/src/Context.cpp +++ b/NetSSL_Win/src/Context.cpp @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string Context::CERT_STORE_MY("MY"); @@ -557,4 +556,4 @@ void Context::requireMinimumProtocol(Protocols protocol) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/HTTPSClientSession.cpp b/NetSSL_Win/src/HTTPSClientSession.cpp index 7848cd7e36..20bd40b9bb 100644 --- a/NetSSL_Win/src/HTTPSClientSession.cpp +++ b/NetSSL_Win/src/HTTPSClientSession.cpp @@ -27,8 +27,7 @@ using Poco::NumberFormatter; using Poco::IllegalStateException; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSClientSession::HTTPSClientSession(): @@ -188,4 +187,4 @@ Session::Ptr HTTPSClientSession::sslSession() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/HTTPSSessionInstantiator.cpp b/NetSSL_Win/src/HTTPSSessionInstantiator.cpp index 3d2f82e7ac..4e5d851e96 100644 --- a/NetSSL_Win/src/HTTPSSessionInstantiator.cpp +++ b/NetSSL_Win/src/HTTPSSessionInstantiator.cpp @@ -17,8 +17,7 @@ #include "Poco/Net/HTTPSClientSession.h" -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSSessionInstantiator::HTTPSSessionInstantiator() @@ -67,4 +66,4 @@ void HTTPSSessionInstantiator::unregisterInstantiator() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/HTTPSStreamFactory.cpp b/NetSSL_Win/src/HTTPSStreamFactory.cpp index 5b1a43db02..8194515cc0 100644 --- a/NetSSL_Win/src/HTTPSStreamFactory.cpp +++ b/NetSSL_Win/src/HTTPSStreamFactory.cpp @@ -32,8 +32,7 @@ using Poco::URIStreamOpener; using Poco::UnbufferedStreamBuf; -namespace Poco { -namespace Net { +namespace Poco::Net { HTTPSStreamFactory::HTTPSStreamFactory(): @@ -181,4 +180,4 @@ void HTTPSStreamFactory::unregisterFactory() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/InvalidCertificateHandler.cpp b/NetSSL_Win/src/InvalidCertificateHandler.cpp index b41a67822a..99344201ab 100644 --- a/NetSSL_Win/src/InvalidCertificateHandler.cpp +++ b/NetSSL_Win/src/InvalidCertificateHandler.cpp @@ -20,8 +20,7 @@ using Poco::Delegate; -namespace Poco { -namespace Net { +namespace Poco::Net { InvalidCertificateHandler::InvalidCertificateHandler(bool handleErrorsOnServerSide): _handleErrorsOnServerSide(handleErrorsOnServerSide) @@ -49,4 +48,4 @@ InvalidCertificateHandler::~InvalidCertificateHandler() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/KeyConsoleHandler.cpp b/NetSSL_Win/src/KeyConsoleHandler.cpp index aae2a259ee..f63a7eca44 100644 --- a/NetSSL_Win/src/KeyConsoleHandler.cpp +++ b/NetSSL_Win/src/KeyConsoleHandler.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { KeyConsoleHandler::KeyConsoleHandler(bool server):PrivateKeyPassphraseHandler(server) @@ -37,4 +36,4 @@ void KeyConsoleHandler::onPrivateKeyRequested(const void* pSender, std::string& } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/KeyFileHandler.cpp b/NetSSL_Win/src/KeyFileHandler.cpp index 1930c9123f..165ff46fd0 100644 --- a/NetSSL_Win/src/KeyFileHandler.cpp +++ b/NetSSL_Win/src/KeyFileHandler.cpp @@ -20,8 +20,7 @@ #include "Poco/Util/OptionException.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string KeyFileHandler::CFG_PRIV_KEY_FILE("privateKeyPassphraseHandler.options.password"); @@ -58,4 +57,4 @@ void KeyFileHandler::onPrivateKeyRequested(const void* pSender, std::string& pri } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/PrivateKeyFactory.cpp b/NetSSL_Win/src/PrivateKeyFactory.cpp index eb07f03b52..a416938b81 100644 --- a/NetSSL_Win/src/PrivateKeyFactory.cpp +++ b/NetSSL_Win/src/PrivateKeyFactory.cpp @@ -16,8 +16,7 @@ #include "Poco/Net/SSLManager.h" -namespace Poco { -namespace Net { +namespace Poco::Net { PrivateKeyFactory::PrivateKeyFactory() @@ -41,4 +40,4 @@ PrivateKeyFactoryRegistrar::~PrivateKeyFactoryRegistrar() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp b/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp index 418c64ccd9..fdb675d782 100644 --- a/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp +++ b/NetSSL_Win/src/PrivateKeyFactoryMgr.cpp @@ -17,8 +17,7 @@ #include "Poco/Net/KeyConsoleHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { PrivateKeyFactoryMgr::PrivateKeyFactoryMgr() @@ -64,4 +63,4 @@ void PrivateKeyFactoryMgr::removeFactory(const std::string& name) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/PrivateKeyPassphraseHandler.cpp b/NetSSL_Win/src/PrivateKeyPassphraseHandler.cpp index d60205685b..6f6001bb02 100644 --- a/NetSSL_Win/src/PrivateKeyPassphraseHandler.cpp +++ b/NetSSL_Win/src/PrivateKeyPassphraseHandler.cpp @@ -20,8 +20,7 @@ using Poco::Delegate; -namespace Poco { -namespace Net { +namespace Poco::Net { PrivateKeyPassphraseHandler::PrivateKeyPassphraseHandler(bool onServerSide): _serverSide(onServerSide) @@ -43,4 +42,4 @@ PrivateKeyPassphraseHandler::~PrivateKeyPassphraseHandler() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/RejectCertificateHandler.cpp b/NetSSL_Win/src/RejectCertificateHandler.cpp index 5e6bbe54b6..2451554988 100644 --- a/NetSSL_Win/src/RejectCertificateHandler.cpp +++ b/NetSSL_Win/src/RejectCertificateHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/RejectCertificateHandler.h" -namespace Poco { -namespace Net { +namespace Poco::Net { RejectCertificateHandler::RejectCertificateHandler(bool server): InvalidCertificateHandler(server) @@ -35,4 +34,4 @@ void RejectCertificateHandler::onInvalidCertificate(const void*, VerificationErr } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/SSLException.cpp b/NetSSL_Win/src/SSLException.cpp index 1ad928f995..99c0e8cbd3 100644 --- a/NetSSL_Win/src/SSLException.cpp +++ b/NetSSL_Win/src/SSLException.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { POCO_IMPLEMENT_EXCEPTION(SSLException, NetException, "SSL Exception") @@ -29,4 +28,4 @@ POCO_IMPLEMENT_EXCEPTION(CertificateValidationException, CertificateException, " POCO_IMPLEMENT_EXCEPTION(SSLConnectionUnexpectedlyClosedException, SSLException, "SSL connection unexpectedly closed") -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/SSLManager.cpp b/NetSSL_Win/src/SSLManager.cpp index f24eac5cb2..5eee31e5c2 100644 --- a/NetSSL_Win/src/SSLManager.cpp +++ b/NetSSL_Win/src/SSLManager.cpp @@ -27,8 +27,7 @@ #include "Poco/Util/OptionException.h" -namespace Poco { -namespace Net { +namespace Poco::Net { const std::string SSLManager::CFG_CERT_NAME("certificateName"); @@ -434,4 +433,4 @@ void uninitializeSSL() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/SecureSMTPClientSession.cpp b/NetSSL_Win/src/SecureSMTPClientSession.cpp index c1fa7d9a3a..4f92d31a80 100644 --- a/NetSSL_Win/src/SecureSMTPClientSession.cpp +++ b/NetSSL_Win/src/SecureSMTPClientSession.cpp @@ -18,8 +18,7 @@ #include "Poco/Net/DialogSocket.h" -namespace Poco { -namespace Net { +namespace Poco::Net { SecureSMTPClientSession::SecureSMTPClientSession(const StreamSocket& socket): @@ -60,4 +59,4 @@ bool SecureSMTPClientSession::startTLS(Context::Ptr pContext) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/SecureServerSocket.cpp b/NetSSL_Win/src/SecureServerSocket.cpp index 45dd1df833..fd40a52922 100644 --- a/NetSSL_Win/src/SecureServerSocket.cpp +++ b/NetSSL_Win/src/SecureServerSocket.cpp @@ -22,8 +22,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { SecureServerSocket::SecureServerSocket(): @@ -118,4 +117,4 @@ Context::Ptr SecureServerSocket::context() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/SecureServerSocketImpl.cpp b/NetSSL_Win/src/SecureServerSocketImpl.cpp index d7e3116585..5e9ea434e7 100644 --- a/NetSSL_Win/src/SecureServerSocketImpl.cpp +++ b/NetSSL_Win/src/SecureServerSocketImpl.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/SecureServerSocketImpl.h" -namespace Poco { -namespace Net { +namespace Poco::Net { SecureServerSocketImpl::SecureServerSocketImpl(Context::Ptr pContext): @@ -133,4 +132,4 @@ bool SecureServerSocketImpl::secure() const } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/SecureSocketImpl.cpp b/NetSSL_Win/src/SecureSocketImpl.cpp index 53e42e04a8..a9ba94eb60 100644 --- a/NetSSL_Win/src/SecureSocketImpl.cpp +++ b/NetSSL_Win/src/SecureSocketImpl.cpp @@ -32,8 +32,7 @@ #endif -namespace Poco { -namespace Net { +namespace Poco::Net { class StateMachine @@ -1820,4 +1819,4 @@ StateMachine::~StateMachine() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/SecureStreamSocket.cpp b/NetSSL_Win/src/SecureStreamSocket.cpp index 0edac8ef83..60c02e5792 100644 --- a/NetSSL_Win/src/SecureStreamSocket.cpp +++ b/NetSSL_Win/src/SecureStreamSocket.cpp @@ -22,8 +22,7 @@ using Poco::InvalidArgumentException; -namespace Poco { -namespace Net { +namespace Poco::Net { SecureStreamSocket::SecureStreamSocket(): @@ -266,4 +265,4 @@ void SecureStreamSocket::abort() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/SecureStreamSocketImpl.cpp b/NetSSL_Win/src/SecureStreamSocketImpl.cpp index 0adace2b98..fe587bf6a5 100644 --- a/NetSSL_Win/src/SecureStreamSocketImpl.cpp +++ b/NetSSL_Win/src/SecureStreamSocketImpl.cpp @@ -17,8 +17,7 @@ #include "Poco/Thread.h" -namespace Poco { -namespace Net { +namespace Poco::Net { SecureStreamSocketImpl::SecureStreamSocketImpl(Context::Ptr pContext): @@ -237,4 +236,4 @@ void SecureStreamSocketImpl::getRawOption(int level, int option, void* value, po } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/Session.cpp b/NetSSL_Win/src/Session.cpp index 0393ae0954..8c5b5f950a 100644 --- a/NetSSL_Win/src/Session.cpp +++ b/NetSSL_Win/src/Session.cpp @@ -21,8 +21,7 @@ #include "Poco/Net/Session.h" -namespace Poco { -namespace Net { +namespace Poco::Net { Session::Session() @@ -35,4 +34,4 @@ Session::~Session() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/Utility.cpp b/NetSSL_Win/src/Utility.cpp index d8ac4eb9c1..191f1cdb4e 100644 --- a/NetSSL_Win/src/Utility.cpp +++ b/NetSSL_Win/src/Utility.cpp @@ -20,8 +20,7 @@ #include -namespace Poco { -namespace Net { +namespace Poco::Net { Context::VerificationMode Utility::convertVerificationMode(const std::string& vMode) @@ -195,4 +194,4 @@ std::string Utility::formatError(long errCode) } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/VerificationErrorArgs.cpp b/NetSSL_Win/src/VerificationErrorArgs.cpp index 2be442cd27..7550dde1be 100644 --- a/NetSSL_Win/src/VerificationErrorArgs.cpp +++ b/NetSSL_Win/src/VerificationErrorArgs.cpp @@ -15,8 +15,7 @@ #include "Poco/Net/VerificationErrorArgs.h" -namespace Poco { -namespace Net { +namespace Poco::Net { VerificationErrorArgs::VerificationErrorArgs(const X509Certificate& cert, int errDepth, int errNum, const std::string& errMsg): @@ -34,4 +33,4 @@ VerificationErrorArgs::~VerificationErrorArgs() } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/NetSSL_Win/src/X509Certificate.cpp b/NetSSL_Win/src/X509Certificate.cpp index 86a7ca33d8..505ee82ffe 100644 --- a/NetSSL_Win/src/X509Certificate.cpp +++ b/NetSSL_Win/src/X509Certificate.cpp @@ -29,8 +29,7 @@ #include "Poco/Net/DNS.h" -namespace Poco { -namespace Net { +namespace Poco::Net { X509Certificate::X509Certificate(const std::string& path): @@ -571,4 +570,4 @@ bool X509Certificate::matchWildcard(const std::string& wildcard, const std::stri } -} } // namespace Poco::Net +} // namespace Poco::Net diff --git a/PDF/include/Poco/PDF/AttributedString.h b/PDF/include/Poco/PDF/AttributedString.h index 49f07b3329..d138160643 100644 --- a/PDF/include/Poco/PDF/AttributedString.h +++ b/PDF/include/Poco/PDF/AttributedString.h @@ -11,8 +11,7 @@ #include "Poco/Dynamic/Var.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API AttributedString @@ -61,7 +60,7 @@ class PDF_API AttributedString }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_AttributedString_INCLUDED diff --git a/PDF/include/Poco/PDF/Cell.h b/PDF/include/Poco/PDF/Cell.h index 929161e2a4..72ae4d32c1 100644 --- a/PDF/include/Poco/PDF/Cell.h +++ b/PDF/include/Poco/PDF/Cell.h @@ -14,8 +14,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API Cell @@ -75,6 +74,6 @@ class PDF_API Cell using TableRow = std::vector; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Cell_INCLUDED diff --git a/PDF/include/Poco/PDF/Destination.h b/PDF/include/Poco/PDF/Destination.h index 2e7913b202..3a2e0af8bf 100644 --- a/PDF/include/Poco/PDF/Destination.h +++ b/PDF/include/Poco/PDF/Destination.h @@ -23,8 +23,7 @@ #include "Poco/PDF/Resource.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API Destination: public Resource @@ -73,7 +72,7 @@ class PDF_API Destination: public Resource }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Destination_INCLUDED diff --git a/PDF/include/Poco/PDF/Encoder.h b/PDF/include/Poco/PDF/Encoder.h index 1105aaa2d3..50afa36d64 100644 --- a/PDF/include/Poco/PDF/Encoder.h +++ b/PDF/include/Poco/PDF/Encoder.h @@ -22,8 +22,7 @@ #include "Poco/PDF/Resource.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API Encoder: public Resource @@ -79,7 +78,7 @@ class PDF_API Encoder: public Resource }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Encoder_INCLUDED diff --git a/PDF/include/Poco/PDF/Font.h b/PDF/include/Poco/PDF/Font.h index 85568eacd9..a60ddb7b49 100644 --- a/PDF/include/Poco/PDF/Font.h +++ b/PDF/include/Poco/PDF/Font.h @@ -23,8 +23,7 @@ #include "Poco/PDF/Resource.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API Font: public Resource @@ -70,7 +69,7 @@ class PDF_API Font: public Resource /// Calculates the byte length which can be included within the specified width. }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Font_INCLUDED diff --git a/PDF/include/Poco/PDF/Image.h b/PDF/include/Poco/PDF/Image.h index d3abc5460c..62f53e891e 100644 --- a/PDF/include/Poco/PDF/Image.h +++ b/PDF/include/Poco/PDF/Image.h @@ -22,8 +22,7 @@ #include "Poco/PDF/Resource.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API Image: public Resource @@ -63,7 +62,7 @@ class PDF_API Image: public Resource -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Image_INCLUDED diff --git a/PDF/include/Poco/PDF/LinkAnnotation.h b/PDF/include/Poco/PDF/LinkAnnotation.h index 9a9e9bf997..5fb7351fc4 100644 --- a/PDF/include/Poco/PDF/LinkAnnotation.h +++ b/PDF/include/Poco/PDF/LinkAnnotation.h @@ -23,8 +23,7 @@ #include "Poco/PDF/Resource.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API LinkAnnotation: public Resource @@ -61,7 +60,7 @@ class PDF_API LinkAnnotation: public Resource }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_LinkAnnotation_INCLUDED diff --git a/PDF/include/Poco/PDF/Outline.h b/PDF/include/Poco/PDF/Outline.h index de7402be32..497e4e0321 100644 --- a/PDF/include/Poco/PDF/Outline.h +++ b/PDF/include/Poco/PDF/Outline.h @@ -23,8 +23,7 @@ #include "Poco/PDF/Destination.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API Outline: public Resource @@ -56,7 +55,7 @@ class PDF_API Outline: public Resource }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Outline_INCLUDED diff --git a/PDF/include/Poco/PDF/PDFException.h b/PDF/include/Poco/PDF/PDFException.h index f8166ba207..5c24fbbcf9 100644 --- a/PDF/include/Poco/PDF/PDFException.h +++ b/PDF/include/Poco/PDF/PDFException.h @@ -23,8 +23,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_data); @@ -36,7 +35,7 @@ POCO_DECLARE_EXCEPTION(PDF_API, PDFException, Poco::RuntimeException) POCO_DECLARE_EXCEPTION(PDF_API, PDFCreateException, PDFException) -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_PDFException_INCLUDED diff --git a/PDF/include/Poco/PDF/Page.h b/PDF/include/Poco/PDF/Page.h index 43a14ec01c..563e1be57d 100644 --- a/PDF/include/Poco/PDF/Page.h +++ b/PDF/include/Poco/PDF/Page.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { class Document; @@ -531,7 +530,7 @@ class PDF_API Page }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Page_INCLUDED diff --git a/PDF/include/Poco/PDF/Resource.h b/PDF/include/Poco/PDF/Resource.h index a254586057..3b15ed6f91 100644 --- a/PDF/include/Poco/PDF/Resource.h +++ b/PDF/include/Poco/PDF/Resource.h @@ -22,8 +22,7 @@ #include "Poco/PDF/Declarations.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { template @@ -110,7 +109,7 @@ class Resource using ExtGraphicsState = Resource; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Resource_INCLUDED diff --git a/PDF/include/Poco/PDF/Table.h b/PDF/include/Poco/PDF/Table.h index 8e2d7c6767..64ca5113a2 100644 --- a/PDF/include/Poco/PDF/Table.h +++ b/PDF/include/Poco/PDF/Table.h @@ -14,8 +14,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API Table @@ -51,7 +50,7 @@ class PDF_API Table }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_Table_INCLUDED diff --git a/PDF/include/Poco/PDF/TextAnnotation.h b/PDF/include/Poco/PDF/TextAnnotation.h index 224676d487..d175dcbc8b 100644 --- a/PDF/include/Poco/PDF/TextAnnotation.h +++ b/PDF/include/Poco/PDF/TextAnnotation.h @@ -23,8 +23,7 @@ #include "Poco/PDF/Declarations.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API TextAnnotation: public Resource @@ -60,7 +59,7 @@ class PDF_API TextAnnotation: public Resource }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_TextAnnotation_INCLUDED diff --git a/PDF/include/Poco/PDF/XMLTemplate.h b/PDF/include/Poco/PDF/XMLTemplate.h index b64f672f4f..d75cf9d21f 100644 --- a/PDF/include/Poco/PDF/XMLTemplate.h +++ b/PDF/include/Poco/PDF/XMLTemplate.h @@ -13,8 +13,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { class PDF_API XMLTemplate @@ -36,7 +35,7 @@ class PDF_API XMLTemplate }; -} } // namespace Poco::PDF +} // namespace Poco::PDF #endif // PDF_DocumentTemplate_INCLUDED diff --git a/PDF/src/AttributedString.cpp b/PDF/src/AttributedString.cpp index 1052d5b051..cbd5c56882 100644 --- a/PDF/src/AttributedString.cpp +++ b/PDF/src/AttributedString.cpp @@ -5,8 +5,7 @@ #include "Poco/PDF/AttributedString.h" #include "Poco/Format.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { AttributedString::AttributedString(): @@ -112,4 +111,4 @@ void AttributedString::clearAttribute(int attr) } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Cell.cpp b/PDF/src/Cell.cpp index a5e6ef5a8c..9afbda1bdb 100644 --- a/PDF/src/Cell.cpp +++ b/PDF/src/Cell.cpp @@ -5,8 +5,7 @@ #include "Poco/PDF/Cell.h" -namespace Poco { -namespace PDF { +namespace Poco::PDF { Cell::Cell(const AttributedString& content, const std::string& name, FontMapPtr pFontMap): @@ -248,4 +247,4 @@ void Cell::draw(Page& page, float x, float y, float width, float height) } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Destination.cpp b/PDF/src/Destination.cpp index 9c4288af93..7cf848c973 100644 --- a/PDF/src/Destination.cpp +++ b/PDF/src/Destination.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { Destination::Destination(HPDF_Doc* pPDF, @@ -78,4 +77,4 @@ void Destination::fitWindowVertical(float left) -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Document.cpp b/PDF/src/Document.cpp index 50e17564b9..fce8f77b00 100644 --- a/PDF/src/Document.cpp +++ b/PDF/src/Document.cpp @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { static_assert(static_cast(Document::Info::INFO_CREATION_DATE) == HPDF_INFO_CREATION_DATE, "Document info value mismatch"); static_assert(static_cast(Document::Info::INFO_KEYWORDS) == HPDF_INFO_KEYWORDS, "Document info value mismatch"); @@ -520,4 +519,4 @@ void Document::reset(bool all) } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Encoder.cpp b/PDF/src/Encoder.cpp index 41e985a99f..abb89fcce1 100644 --- a/PDF/src/Encoder.cpp +++ b/PDF/src/Encoder.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { Encoder::Encoder(HPDF_Doc* pPDF, @@ -54,4 +53,4 @@ Encoder::WriteMode Encoder::writeMode() -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Font.cpp b/PDF/src/Font.cpp index b7693a8c49..6d2d82246d 100644 --- a/PDF/src/Font.cpp +++ b/PDF/src/Font.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { Font::Font(HPDF_Doc* pPDF, HPDF_Font font): @@ -96,4 +95,4 @@ int Font::measureText(const std::string& text, } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Image.cpp b/PDF/src/Image.cpp index 9082dc24ed..aecf4ffb92 100644 --- a/PDF/src/Image.cpp +++ b/PDF/src/Image.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { Image::Image(HPDF_Doc* pPDF, const HPDF_Image& resource, const std::string& name): @@ -73,4 +72,4 @@ void Image::colorMask(Poco::UInt32 redMin, blueMax); } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/LinkAnnotation.cpp b/PDF/src/LinkAnnotation.cpp index 9e833bda9d..7dbd484035 100644 --- a/PDF/src/LinkAnnotation.cpp +++ b/PDF/src/LinkAnnotation.cpp @@ -15,8 +15,7 @@ #include "Poco/PDF/LinkAnnotation.h" #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { LinkAnnotation::LinkAnnotation(HPDF_Doc* pPDF, @@ -41,4 +40,4 @@ void LinkAnnotation::setBorderStyle(float width, Poco::UInt32 dashOn, Poco::UInt -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Outline.cpp b/PDF/src/Outline.cpp index 9a579c8044..51a4fe8db2 100644 --- a/PDF/src/Outline.cpp +++ b/PDF/src/Outline.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { Outline::Outline(HPDF_Doc* pPDF, const HPDF_Outline& outline, const std::string& name): @@ -57,4 +56,4 @@ void Outline::destination(const Destination& dest) } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/PDFException.cpp b/PDF/src/PDFException.cpp index dbb43b1b39..54724b78cc 100644 --- a/PDF/src/PDFException.cpp +++ b/PDF/src/PDFException.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { void HPDF_Error_Handler(HPDF_STATUS error_no, HPDF_STATUS detail_no, void* user_data) @@ -267,4 +266,4 @@ POCO_IMPLEMENT_EXCEPTION(PDFException, Poco::RuntimeException, "PDF Base Excepti POCO_IMPLEMENT_EXCEPTION(PDFCreateException, PDFException, "PDF creation failed") -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Page.cpp b/PDF/src/Page.cpp index 34b668908a..1566e23edc 100644 --- a/PDF/src/Page.cpp +++ b/PDF/src/Page.cpp @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { static_assert(static_cast(Page::Size::PAGE_SIZE_LETTER) == HPDF_PAGE_SIZE_LETTER, "Page size value mismatch"); static_assert(static_cast(Page::Size::PAGE_SIZE_COMM10) == HPDF_PAGE_SIZE_COMM10, "Page size value mismatch"); @@ -823,4 +822,4 @@ const LinkAnnotation& Page::createURILinkAnnotation(const std::string& name, } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/Table.cpp b/PDF/src/Table.cpp index 2a38118f58..7d851df60d 100644 --- a/PDF/src/Table.cpp +++ b/PDF/src/Table.cpp @@ -5,8 +5,7 @@ #include "Poco/PDF/Table.h" #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { Table::Table(int columnCount, int rowCount, const std::string& name, Cell::FontMapPtr pFontMap): @@ -113,4 +112,4 @@ void Table::draw(Page& page, float x, float y, float width, float height) } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/TextAnnotation.cpp b/PDF/src/TextAnnotation.cpp index ef7f6b70be..01741d5e84 100644 --- a/PDF/src/TextAnnotation.cpp +++ b/PDF/src/TextAnnotation.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { TextAnnotation::TextAnnotation(HPDF_Doc* pPDF, @@ -53,4 +52,4 @@ void TextAnnotation::icon(IconType iconType) } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PDF/src/XMLTemplate.cpp b/PDF/src/XMLTemplate.cpp index 7584243265..a95e84e56b 100644 --- a/PDF/src/XMLTemplate.cpp +++ b/PDF/src/XMLTemplate.cpp @@ -24,8 +24,7 @@ #include #include -namespace Poco { -namespace PDF { +namespace Poco::PDF { class StackedConfiguration : public Poco::Util::AbstractConfiguration { @@ -868,4 +867,4 @@ void XMLTemplate::create(const std::string& path) } -} } // namespace Poco::PDF +} // namespace Poco::PDF diff --git a/PocoDoc/src/DocWriter.h b/PocoDoc/src/DocWriter.h index af2ee12e90..a9df097a6a 100644 --- a/PocoDoc/src/DocWriter.h +++ b/PocoDoc/src/DocWriter.h @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace CppParser { +namespace Poco::CppParser { class Symbol; @@ -33,7 +32,7 @@ class Enum; class Variable; -} } // namespace Poco::CppParser +} // namespace Poco::CppParser class DocWriter diff --git a/Prometheus/include/Poco/Prometheus/AtomicFloat.h b/Prometheus/include/Poco/Prometheus/AtomicFloat.h index 07c2b19b1b..aae3bb6053 100644 --- a/Prometheus/include/Poco/Prometheus/AtomicFloat.h +++ b/Prometheus/include/Poco/Prometheus/AtomicFloat.h @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { template @@ -99,7 +98,7 @@ class AtomicFloat }; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_AtomicFloat_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/CallbackMetric.h b/Prometheus/include/Poco/Prometheus/CallbackMetric.h index c2b6a5a940..1fe839aefa 100644 --- a/Prometheus/include/Poco/Prometheus/CallbackMetric.h +++ b/Prometheus/include/Poco/Prometheus/CallbackMetric.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { template @@ -145,7 +144,7 @@ using CallbackCounter = CallbackMetric; using CallbackGauge = CallbackMetric; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_CallbackMetric_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/Collector.h b/Prometheus/include/Poco/Prometheus/Collector.h index f78dfb9090..d7f12f2f76 100644 --- a/Prometheus/include/Poco/Prometheus/Collector.h +++ b/Prometheus/include/Poco/Prometheus/Collector.h @@ -22,8 +22,7 @@ #include "Poco/Prometheus/Registry.h" -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Exporter; @@ -108,7 +107,7 @@ inline const std::string& Collector::name() const } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_Collector_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/Counter.h b/Prometheus/include/Poco/Prometheus/Counter.h index d24f2c1abb..d35ec99dde 100644 --- a/Prometheus/include/Poco/Prometheus/Counter.h +++ b/Prometheus/include/Poco/Prometheus/Counter.h @@ -23,8 +23,7 @@ #include "Poco/Mutex.h" -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Prometheus_API CounterSample @@ -185,7 +184,7 @@ inline void Counter::inc(double v) } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_Counter_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/Exporter.h b/Prometheus/include/Poco/Prometheus/Exporter.h index abf2526eba..f801dfb1f6 100644 --- a/Prometheus/include/Poco/Prometheus/Exporter.h +++ b/Prometheus/include/Poco/Prometheus/Exporter.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Metric; @@ -70,7 +69,7 @@ class Prometheus_API Exporter }; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_Exporter_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/Gauge.h b/Prometheus/include/Poco/Prometheus/Gauge.h index fc08af136d..f6aacdf03f 100644 --- a/Prometheus/include/Poco/Prometheus/Gauge.h +++ b/Prometheus/include/Poco/Prometheus/Gauge.h @@ -24,8 +24,7 @@ #include "Poco/Mutex.h" -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Prometheus_API GaugeSample @@ -267,7 +266,7 @@ inline void Gauge::setToCurrentTime() } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_Gauge_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/Histogram.h b/Prometheus/include/Poco/Prometheus/Histogram.h index 811e773cf7..ff18ce2a98 100644 --- a/Prometheus/include/Poco/Prometheus/Histogram.h +++ b/Prometheus/include/Poco/Prometheus/Histogram.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { struct Prometheus_API HistogramData @@ -230,7 +229,7 @@ inline const std::vector Histogram::buckets() const } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_Gauge_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/IntCounter.h b/Prometheus/include/Poco/Prometheus/IntCounter.h index 429a949316..ec1f13bdeb 100644 --- a/Prometheus/include/Poco/Prometheus/IntCounter.h +++ b/Prometheus/include/Poco/Prometheus/IntCounter.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Registry; @@ -147,7 +146,7 @@ inline void IntCounter::inc(IntCounter::Sample v) } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_IntCounter_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/IntGauge.h b/Prometheus/include/Poco/Prometheus/IntGauge.h index 3da636cac3..0e7b68bf46 100644 --- a/Prometheus/include/Poco/Prometheus/IntGauge.h +++ b/Prometheus/include/Poco/Prometheus/IntGauge.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Registry; @@ -180,7 +179,7 @@ inline void IntGauge::setToCurrentTime() } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_IntGauge_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/LabeledMetric.h b/Prometheus/include/Poco/Prometheus/LabeledMetric.h index 393a304d87..c939cfa9b5 100644 --- a/Prometheus/include/Poco/Prometheus/LabeledMetric.h +++ b/Prometheus/include/Poco/Prometheus/LabeledMetric.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Prometheus_API LabeledMetric: public Metric @@ -89,7 +88,7 @@ inline const std::vector& LabeledMetric::labelNames() const } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_Metric_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/LabeledMetricImpl.h b/Prometheus/include/Poco/Prometheus/LabeledMetricImpl.h index 189d338703..d93e27be45 100644 --- a/Prometheus/include/Poco/Prometheus/LabeledMetricImpl.h +++ b/Prometheus/include/Poco/Prometheus/LabeledMetricImpl.h @@ -32,8 +32,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { template @@ -187,7 +186,7 @@ class LabeledMetricImpl: public LabeledMetric }; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_LabeledMetricImpl_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/Metric.h b/Prometheus/include/Poco/Prometheus/Metric.h index 92e0062756..27cd32d084 100644 --- a/Prometheus/include/Poco/Prometheus/Metric.h +++ b/Prometheus/include/Poco/Prometheus/Metric.h @@ -22,8 +22,7 @@ #include "Poco/Prometheus/Registry.h" -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Prometheus_API Metric: public Collector @@ -110,7 +109,7 @@ inline void Metric::setHelp(const std::string& help) } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_Metric_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/MetricsRequestHandler.h b/Prometheus/include/Poco/Prometheus/MetricsRequestHandler.h index 6d6901e903..fc3949a9fc 100644 --- a/Prometheus/include/Poco/Prometheus/MetricsRequestHandler.h +++ b/Prometheus/include/Poco/Prometheus/MetricsRequestHandler.h @@ -22,8 +22,7 @@ #include "Poco/Net/HTTPRequestHandler.h" -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Registry; @@ -48,7 +47,7 @@ class Prometheus_API MetricsRequestHandler: public Poco::Net::HTTPRequestHandler }; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_MetricsRequestHandler_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/MetricsServer.h b/Prometheus/include/Poco/Prometheus/MetricsServer.h index 51d9359db6..3c233ececd 100644 --- a/Prometheus/include/Poco/Prometheus/MetricsServer.h +++ b/Prometheus/include/Poco/Prometheus/MetricsServer.h @@ -24,8 +24,7 @@ #include "Poco/Net/ServerSocket.h" -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Registry; @@ -74,7 +73,7 @@ class Prometheus_API MetricsServer }; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_MetricsServer_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/ProcessCollector.h b/Prometheus/include/Poco/Prometheus/ProcessCollector.h index 8b109796e6..8d31c39edf 100644 --- a/Prometheus/include/Poco/Prometheus/ProcessCollector.h +++ b/Prometheus/include/Poco/Prometheus/ProcessCollector.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Prometheus_API ProcessCollector: public Collector @@ -77,7 +76,7 @@ inline Poco::Timestamp ProcessCollector::startTime() } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_ProcessCollector_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/Registry.h b/Prometheus/include/Poco/Prometheus/Registry.h index 2be5076a8c..cafcd706ae 100644 --- a/Prometheus/include/Poco/Prometheus/Registry.h +++ b/Prometheus/include/Poco/Prometheus/Registry.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Collector; @@ -95,7 +94,7 @@ class Prometheus_API Registry }; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_Metric_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/TextExporter.h b/Prometheus/include/Poco/Prometheus/TextExporter.h index d9ec86cef8..b1ab904a93 100644 --- a/Prometheus/include/Poco/Prometheus/TextExporter.h +++ b/Prometheus/include/Poco/Prometheus/TextExporter.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Prometheus_API TextExporter: public Exporter @@ -67,7 +66,7 @@ class Prometheus_API TextExporter: public Exporter }; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_TextExporter_INCLUDED diff --git a/Prometheus/include/Poco/Prometheus/ThreadPoolCollector.h b/Prometheus/include/Poco/Prometheus/ThreadPoolCollector.h index 62ed2a5d13..c3ffa65334 100644 --- a/Prometheus/include/Poco/Prometheus/ThreadPoolCollector.h +++ b/Prometheus/include/Poco/Prometheus/ThreadPoolCollector.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class Prometheus_API ThreadPoolCollector: public Collector @@ -73,7 +72,7 @@ class Prometheus_API ThreadPoolCollector: public Collector }; -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus #endif // Prometheus_ThreadPoolCollector_INCLUDED diff --git a/Prometheus/src/Collector.cpp b/Prometheus/src/Collector.cpp index d067abce9a..844aa2f291 100644 --- a/Prometheus/src/Collector.cpp +++ b/Prometheus/src/Collector.cpp @@ -20,8 +20,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { const std::string& Collector::validateName(const std::string& name) @@ -34,4 +33,4 @@ const std::string& Collector::validateName(const std::string& name) } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/Counter.cpp b/Prometheus/src/Counter.cpp index cfe89af549..94ac8a730b 100644 --- a/Prometheus/src/Counter.cpp +++ b/Prometheus/src/Counter.cpp @@ -15,8 +15,7 @@ #include "Poco/Prometheus/Counter.h" -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { Counter::Counter(const std::string& name): @@ -79,4 +78,4 @@ void Counter::writeSample(Exporter& exporter, const std::vector& la } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/Gauge.cpp b/Prometheus/src/Gauge.cpp index 4a20f1a878..eff8e0a7a8 100644 --- a/Prometheus/src/Gauge.cpp +++ b/Prometheus/src/Gauge.cpp @@ -15,8 +15,7 @@ #include "Poco/Prometheus/Gauge.h" -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { Gauge::Gauge(const std::string& name): @@ -79,4 +78,4 @@ void Gauge::writeSample(Exporter& exporter, const std::vector& labe } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/Histogram.cpp b/Prometheus/src/Histogram.cpp index 5e76a8ba70..58193999ed 100644 --- a/Prometheus/src/Histogram.cpp +++ b/Prometheus/src/Histogram.cpp @@ -20,8 +20,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { HistogramSample::HistogramSample(const std::vector& bucketBounds): @@ -148,4 +147,4 @@ void Histogram::exportTo(Exporter& exporter) const } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/IntCounter.cpp b/Prometheus/src/IntCounter.cpp index 71eeb523c2..9be1c3c157 100644 --- a/Prometheus/src/IntCounter.cpp +++ b/Prometheus/src/IntCounter.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { void IntCounter::exportTo(Exporter& exporter) const @@ -30,4 +29,4 @@ void IntCounter::exportTo(Exporter& exporter) const } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/IntGauge.cpp b/Prometheus/src/IntGauge.cpp index efc8a5f8b8..4cd7e774da 100644 --- a/Prometheus/src/IntGauge.cpp +++ b/Prometheus/src/IntGauge.cpp @@ -17,8 +17,7 @@ #include -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { void IntGauge::exportTo(Exporter& exporter) const @@ -30,4 +29,4 @@ void IntGauge::exportTo(Exporter& exporter) const } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/LabeledMetric.cpp b/Prometheus/src/LabeledMetric.cpp index 9ffc2bb0b0..946fb3c715 100644 --- a/Prometheus/src/LabeledMetric.cpp +++ b/Prometheus/src/LabeledMetric.cpp @@ -20,8 +20,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { const std::vector LabeledMetric::EMPTY_LABEL; @@ -49,4 +48,4 @@ void LabeledMetric::setLabelNames(const std::vector& labelNames) } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/MetricsRequestHandler.cpp b/Prometheus/src/MetricsRequestHandler.cpp index c0f2fca032..b8c55b8fc9 100644 --- a/Prometheus/src/MetricsRequestHandler.cpp +++ b/Prometheus/src/MetricsRequestHandler.cpp @@ -23,8 +23,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { MetricsRequestHandler::MetricsRequestHandler(): @@ -66,4 +65,4 @@ void MetricsRequestHandler::handleRequest(Poco::Net::HTTPServerRequest& request, } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/MetricsServer.cpp b/Prometheus/src/MetricsServer.cpp index 36670cbd6b..9eef4ba62d 100644 --- a/Prometheus/src/MetricsServer.cpp +++ b/Prometheus/src/MetricsServer.cpp @@ -23,8 +23,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { class NotFoundRequestHandler: public Poco::Net::HTTPRequestHandler @@ -115,4 +114,4 @@ Poco::Net::HTTPServerParams::Ptr MetricsServer::defaultParams() } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/ProcessCollector.cpp b/Prometheus/src/ProcessCollector.cpp index 8694abdc16..5e6975d8df 100644 --- a/Prometheus/src/ProcessCollector.cpp +++ b/Prometheus/src/ProcessCollector.cpp @@ -24,8 +24,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { Poco::Timestamp ProcessCollector::_startTime; @@ -99,4 +98,4 @@ void ProcessCollector::buildMetrics() } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/Registry.cpp b/Prometheus/src/Registry.cpp index ae2fd0b3e9..211d3d6737 100644 --- a/Prometheus/src/Registry.cpp +++ b/Prometheus/src/Registry.cpp @@ -20,8 +20,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { void Registry::registerCollector(Collector* pCollector) @@ -96,4 +95,4 @@ Registry& Registry::defaultRegistry() } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/TextExporter.cpp b/Prometheus/src/TextExporter.cpp index 940530bb92..056eb86b22 100644 --- a/Prometheus/src/TextExporter.cpp +++ b/Prometheus/src/TextExporter.cpp @@ -22,8 +22,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { const std::string TextExporter::COUNTER{"counter"s}; @@ -182,4 +181,4 @@ const std::string& TextExporter::typeToString(Metric::Type type) } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Prometheus/src/ThreadPoolCollector.cpp b/Prometheus/src/ThreadPoolCollector.cpp index 99dae15618..9e2e6a74c9 100644 --- a/Prometheus/src/ThreadPoolCollector.cpp +++ b/Prometheus/src/ThreadPoolCollector.cpp @@ -19,8 +19,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Prometheus { +namespace Poco::Prometheus { const std::string ThreadPoolCollector::NAME_PREFIX{"poco_threadpool"s}; @@ -117,4 +116,4 @@ std::string ThreadPoolCollector::collectorName(const std::string& threadPoolName } -} } // namespace Poco::Prometheus +} // namespace Poco::Prometheus diff --git a/Redis/include/Poco/Redis/Array.h b/Redis/include/Poco/Redis/Array.h index 4f581fe277..b439eaf302 100644 --- a/Redis/include/Poco/Redis/Array.h +++ b/Redis/include/Poco/Redis/Array.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Redis { +namespace Poco::Redis { class Redis_API Array @@ -319,8 +318,7 @@ struct RedisTypeTraits }; -} // namespace Redis -} // namespace Poco +} // namespace Poco::Redis #endif // Redis_Array_INCLUDED diff --git a/Redis/include/Poco/Redis/AsyncReader.h b/Redis/include/Poco/Redis/AsyncReader.h index 040ce3292a..b9f1d5f09e 100644 --- a/Redis/include/Poco/Redis/AsyncReader.h +++ b/Redis/include/Poco/Redis/AsyncReader.h @@ -24,8 +24,7 @@ #include "Poco/Activity.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { class Redis_API AsyncReader @@ -92,7 +91,7 @@ inline void AsyncReader::stop() } -} } // namespace Poco::Redis +} // namespace Poco::Redis #endif //Redis_AsyncReader_INCLUDED diff --git a/Redis/include/Poco/Redis/Client.h b/Redis/include/Poco/Redis/Client.h index 7266e932a1..b2faf18300 100644 --- a/Redis/include/Poco/Redis/Client.h +++ b/Redis/include/Poco/Redis/Client.h @@ -30,8 +30,7 @@ #include -namespace Poco { -namespace Redis { +namespace Poco::Redis { class Redis_API Client @@ -262,7 +261,7 @@ inline void Client::setReceiveTimeout(const Timespan& timeout) } -} } // namespace Poco::Redis +} // namespace Poco::Redis #endif // Redis_Client_INCLUDED diff --git a/Redis/include/Poco/Redis/Command.h b/Redis/include/Poco/Redis/Command.h index 18024cfec4..c415ec0d62 100644 --- a/Redis/include/Poco/Redis/Command.h +++ b/Redis/include/Poco/Redis/Command.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Redis { +namespace Poco::Redis { class Redis_API Command: public Array @@ -285,8 +284,7 @@ class Redis_API Command: public Array }; -} // namespace Redis -} // namespace Poco +} // namespace Poco::Redis #endif // Redis_Command_INCLUDED diff --git a/Redis/include/Poco/Redis/Error.h b/Redis/include/Poco/Redis/Error.h index ddc8155bd5..342ba6c130 100644 --- a/Redis/include/Poco/Redis/Error.h +++ b/Redis/include/Poco/Redis/Error.h @@ -21,8 +21,7 @@ #include "Poco/Redis/Type.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { class Redis_API Error @@ -85,7 +84,7 @@ struct RedisTypeTraits }; -} } // namespace Poco::Redis +} // namespace Poco::Redis #endif // Redis_Error_INCLUDED diff --git a/Redis/include/Poco/Redis/Exception.h b/Redis/include/Poco/Redis/Exception.h index 445442821a..94631ff5af 100644 --- a/Redis/include/Poco/Redis/Exception.h +++ b/Redis/include/Poco/Redis/Exception.h @@ -23,14 +23,13 @@ #include -namespace Poco { -namespace Redis { +namespace Poco::Redis { POCO_DECLARE_EXCEPTION(Redis_API, RedisException, Exception) -} } // namespace Poco::Redis +} // namespace Poco::Redis #endif // Redis_Exception_INCLUDED diff --git a/Redis/include/Poco/Redis/RedisEventArgs.h b/Redis/include/Poco/Redis/RedisEventArgs.h index 6150078980..44c8b5dc01 100644 --- a/Redis/include/Poco/Redis/RedisEventArgs.h +++ b/Redis/include/Poco/Redis/RedisEventArgs.h @@ -21,8 +21,7 @@ #include "Poco/Redis/Type.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { class Redis_API RedisEventArgs @@ -93,7 +92,7 @@ inline void RedisEventArgs::stop() } -} } // namespace Poco::Redis +} // namespace Poco::Redis #endif // Redis_RedisEventArgs_INCLUDED diff --git a/Redis/include/Poco/Redis/RedisNotifications.h b/Redis/include/Poco/Redis/RedisNotifications.h index b5d3a60c57..0713a10b1c 100644 --- a/Redis/include/Poco/Redis/RedisNotifications.h +++ b/Redis/include/Poco/Redis/RedisNotifications.h @@ -23,8 +23,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { class Redis_API RedisNotification: public Notification @@ -108,7 +107,7 @@ inline const std::string& RedisErrorNotification::message() const } -} } // namespace Poco::Redis +} // namespace Poco::Redis #endif // Redis_RedisNotifications_INCLUDED diff --git a/Redis/include/Poco/Redis/RedisStream.h b/Redis/include/Poco/Redis/RedisStream.h index d6a0a819c1..7d6f2ade15 100644 --- a/Redis/include/Poco/Redis/RedisStream.h +++ b/Redis/include/Poco/Redis/RedisStream.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Redis { +namespace Poco::Redis { class RedisStreamBuf: public BufferedStreamBuf @@ -108,7 +107,7 @@ class Redis_API RedisInputStream: public RedisIOS, public std::istream }; -} } // namespace Poco::Redis +} // namespace Poco::Redis #endif // Redis_RedisStream_INCLUDED diff --git a/Redis/include/Poco/Redis/Type.h b/Redis/include/Poco/Redis/Type.h index a54c246eca..97be139ccc 100644 --- a/Redis/include/Poco/Redis/Type.h +++ b/Redis/include/Poco/Redis/Type.h @@ -27,8 +27,7 @@ #include "Poco/Redis/RedisStream.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { class Redis_API RedisType @@ -287,7 +286,7 @@ class Type: public RedisType }; -} } // namespace Poco/Redis +} // namespace Poco::Redis #endif // Redis_Type_INCLUDED diff --git a/Redis/src/Array.cpp b/Redis/src/Array.cpp index a1b958db09..fb677b414b 100644 --- a/Redis/src/Array.cpp +++ b/Redis/src/Array.cpp @@ -17,8 +17,7 @@ #include "Poco/Redis/Array.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { Array::Array() @@ -64,4 +63,4 @@ std::string Array::toString() const } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/AsyncReader.cpp b/Redis/src/AsyncReader.cpp index 31f2545d4e..4a48440321 100644 --- a/Redis/src/AsyncReader.cpp +++ b/Redis/src/AsyncReader.cpp @@ -17,8 +17,7 @@ #include "Poco/Redis/AsyncReader.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { AsyncReader::AsyncReader(Client& client): @@ -58,4 +57,4 @@ void AsyncReader::runActivity() } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/Client.cpp b/Redis/src/Client.cpp index 6a31b5f022..ee04dad292 100644 --- a/Redis/src/Client.cpp +++ b/Redis/src/Client.cpp @@ -19,8 +19,7 @@ #include "Poco/Redis/RedisNotifications.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { Client::Client() @@ -284,4 +283,4 @@ Client::NotificationCenterPtr Client::notificationCenter() } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/Command.cpp b/Redis/src/Command.cpp index de660c81b5..32acab3f31 100644 --- a/Redis/src/Command.cpp +++ b/Redis/src/Command.cpp @@ -18,8 +18,7 @@ #include "Poco/NumberFormatter.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { Command::Command(const std::string& command): Array() @@ -763,4 +762,4 @@ Command Command::auth(const std::string& username, const std::string& password) } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/Error.cpp b/Redis/src/Error.cpp index 47f7cb766f..fd2dd6d4e0 100644 --- a/Redis/src/Error.cpp +++ b/Redis/src/Error.cpp @@ -17,8 +17,7 @@ #include "Poco/Redis/Error.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { Error::Error() @@ -36,4 +35,4 @@ Error::~Error() } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/Exception.cpp b/Redis/src/Exception.cpp index e2829f12a5..28681a019f 100644 --- a/Redis/src/Exception.cpp +++ b/Redis/src/Exception.cpp @@ -17,11 +17,10 @@ #include "Poco/Redis/Exception.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { POCO_IMPLEMENT_EXCEPTION(RedisException, Exception, "Redis Exception") -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/RedisEventArgs.cpp b/Redis/src/RedisEventArgs.cpp index 1c95cda21d..cfc184453a 100644 --- a/Redis/src/RedisEventArgs.cpp +++ b/Redis/src/RedisEventArgs.cpp @@ -17,8 +17,7 @@ #include "Poco/Redis/RedisEventArgs.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { RedisEventArgs::RedisEventArgs(RedisType::Ptr pMessage): @@ -43,4 +42,4 @@ RedisEventArgs::~RedisEventArgs() } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/RedisNotifications.cpp b/Redis/src/RedisNotifications.cpp index f5cd95f0fb..91844cdb19 100644 --- a/Redis/src/RedisNotifications.cpp +++ b/Redis/src/RedisNotifications.cpp @@ -17,8 +17,7 @@ #include "Poco/Redis/RedisNotifications.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { RedisNotification::RedisNotification() @@ -71,4 +70,4 @@ RedisErrorNotification::~RedisErrorNotification() } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/RedisStream.cpp b/Redis/src/RedisStream.cpp index e60d16ed57..6306ac753d 100644 --- a/Redis/src/RedisStream.cpp +++ b/Redis/src/RedisStream.cpp @@ -18,8 +18,7 @@ #include -namespace Poco { -namespace Redis { +namespace Poco::Redis { // @@ -144,4 +143,4 @@ std::string RedisInputStream::getline() } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/Redis/src/Type.cpp b/Redis/src/Type.cpp index 83a5044888..7b95a2d7cb 100644 --- a/Redis/src/Type.cpp +++ b/Redis/src/Type.cpp @@ -19,8 +19,7 @@ #include "Poco/Redis/Array.h" -namespace Poco { -namespace Redis { +namespace Poco::Redis { RedisType::RedisType() @@ -59,4 +58,4 @@ RedisType::Ptr RedisType::createRedisType(char marker) } -} } // namespace Poco::Redis +} // namespace Poco::Redis diff --git a/SevenZip/include/Poco/SevenZip/Archive.h b/SevenZip/include/Poco/SevenZip/Archive.h index bf74b081f5..1d5324f05a 100644 --- a/SevenZip/include/Poco/SevenZip/Archive.h +++ b/SevenZip/include/Poco/SevenZip/Archive.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace SevenZip { +namespace Poco::SevenZip { class ArchiveImpl; @@ -113,7 +112,7 @@ class SevenZip_API Archive // -} } // namespace Poco::SevenZip +} // namespace Poco::SevenZip #endif // SevenZip_ArchiveEntry_INCLUDED diff --git a/SevenZip/include/Poco/SevenZip/ArchiveEntry.h b/SevenZip/include/Poco/SevenZip/ArchiveEntry.h index 75ec480a49..f23b3f892a 100644 --- a/SevenZip/include/Poco/SevenZip/ArchiveEntry.h +++ b/SevenZip/include/Poco/SevenZip/ArchiveEntry.h @@ -22,8 +22,7 @@ #include "Poco/Timestamp.h" -namespace Poco { -namespace SevenZip { +namespace Poco::SevenZip { class SevenZip_API ArchiveEntry @@ -158,7 +157,7 @@ inline bool ArchiveEntry::isDirectory() const } -} } // namespace Poco::SevenZip +} // namespace Poco::SevenZip #endif // SevenZip_ArchiveEntry_INCLUDED diff --git a/SevenZip/src/Archive.cpp b/SevenZip/src/Archive.cpp index 6de0a16c8f..ff15fed68b 100644 --- a/SevenZip/src/Archive.cpp +++ b/SevenZip/src/Archive.cpp @@ -29,8 +29,7 @@ #include "7zFile.h" -namespace Poco { -namespace SevenZip { +namespace Poco::SevenZip { class ArchiveImpl @@ -374,4 +373,4 @@ std::string Archive::extract(const ArchiveEntry& entry, const std::string& destP } -} } // namespace Poco::SevenZip +} // namespace Poco::SevenZip diff --git a/SevenZip/src/ArchiveEntry.cpp b/SevenZip/src/ArchiveEntry.cpp index 75e278be77..1fea7897bd 100644 --- a/SevenZip/src/ArchiveEntry.cpp +++ b/SevenZip/src/ArchiveEntry.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace SevenZip { +namespace Poco::SevenZip { ArchiveEntry::ArchiveEntry(): @@ -76,4 +75,4 @@ void ArchiveEntry::swap(ArchiveEntry& entry) noexcept } -} } // namespace Poco::SevenZip +} // namespace Poco::SevenZip diff --git a/Util/include/Poco/Util/AbstractConfiguration.h b/Util/include/Poco/Util/AbstractConfiguration.h index 0a32f87ec7..a90abb839b 100644 --- a/Util/include/Poco/Util/AbstractConfiguration.h +++ b/Util/include/Poco/Util/AbstractConfiguration.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API AbstractConfiguration: public Poco::RefCountedObject @@ -572,7 +571,7 @@ inline Poco::UInt32 AbstractConfiguration::getUInt32(const std::string& key, Poc } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_AbstractConfiguration_INCLUDED diff --git a/Util/include/Poco/Util/Application.h b/Util/include/Poco/Util/Application.h index ffee2eda4f..221c5102d0 100644 --- a/Util/include/Poco/Util/Application.h +++ b/Util/include/Poco/Util/Application.h @@ -35,8 +35,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class OptionSet; @@ -572,7 +571,7 @@ inline Poco::Timespan Application::uptime() const } -} } // namespace Poco::Util +} // namespace Poco::Util // diff --git a/Util/include/Poco/Util/ConfigurationMapper.h b/Util/include/Poco/Util/ConfigurationMapper.h index abb614dcbd..e1347d95a9 100644 --- a/Util/include/Poco/Util/ConfigurationMapper.h +++ b/Util/include/Poco/Util/ConfigurationMapper.h @@ -22,8 +22,7 @@ #include "Poco/Util/AbstractConfiguration.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API ConfigurationMapper: public AbstractConfiguration @@ -88,7 +87,7 @@ class Util_API ConfigurationMapper: public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_ConfigurationMapper_INCLUDED diff --git a/Util/include/Poco/Util/ConfigurationView.h b/Util/include/Poco/Util/ConfigurationView.h index acd1481daf..9233c16a03 100644 --- a/Util/include/Poco/Util/ConfigurationView.h +++ b/Util/include/Poco/Util/ConfigurationView.h @@ -22,8 +22,7 @@ #include "Poco/Util/AbstractConfiguration.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API AbstractConfigurationView: public AbstractConfiguration @@ -94,7 +93,7 @@ class Util_API ConfigurationView: public AbstractConfigurationView }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_ConfigurationView_INCLUDED diff --git a/Util/include/Poco/Util/FastLoggerConfigurator.h b/Util/include/Poco/Util/FastLoggerConfigurator.h index 093714c39f..42bf004a1a 100644 --- a/Util/include/Poco/Util/FastLoggerConfigurator.h +++ b/Util/include/Poco/Util/FastLoggerConfigurator.h @@ -29,8 +29,7 @@ #include "Poco/Util/AbstractConfiguration.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API FastLoggerConfigurator @@ -89,7 +88,7 @@ class Util_API FastLoggerConfigurator }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // POCO_ENABLE_FASTLOGGER diff --git a/Util/include/Poco/Util/FilesystemConfiguration.h b/Util/include/Poco/Util/FilesystemConfiguration.h index c61e1c4f62..2f7e5633ee 100644 --- a/Util/include/Poco/Util/FilesystemConfiguration.h +++ b/Util/include/Poco/Util/FilesystemConfiguration.h @@ -23,8 +23,7 @@ #include "Poco/Path.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API FilesystemConfiguration: public AbstractConfiguration @@ -89,7 +88,7 @@ class Util_API FilesystemConfiguration: public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_FilesystemConfiguration_INCLUDED diff --git a/Util/include/Poco/Util/HelpFormatter.h b/Util/include/Poco/Util/HelpFormatter.h index 444fbfbc4a..cde7b13967 100644 --- a/Util/include/Poco/Util/HelpFormatter.h +++ b/Util/include/Poco/Util/HelpFormatter.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class OptionSet; @@ -196,7 +195,7 @@ inline bool HelpFormatter::isUnixStyle() const } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_HelpFormatter_INCLUDED diff --git a/Util/include/Poco/Util/IniFileConfiguration.h b/Util/include/Poco/Util/IniFileConfiguration.h index 6d58075eb8..5d7c01c6db 100644 --- a/Util/include/Poco/Util/IniFileConfiguration.h +++ b/Util/include/Poco/Util/IniFileConfiguration.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API IniFileConfiguration: public AbstractConfiguration @@ -91,7 +90,7 @@ class Util_API IniFileConfiguration: public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // POCO_UTIL_NO_INIFILECONFIGURATION diff --git a/Util/include/Poco/Util/IntValidator.h b/Util/include/Poco/Util/IntValidator.h index a1ce1ee52f..7ea746dbfa 100644 --- a/Util/include/Poco/Util/IntValidator.h +++ b/Util/include/Poco/Util/IntValidator.h @@ -22,8 +22,7 @@ #include "Poco/Util/Validator.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API IntValidator: public Validator @@ -50,7 +49,7 @@ class Util_API IntValidator: public Validator }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_IntValidator_INCLUDED diff --git a/Util/include/Poco/Util/JSONConfiguration.h b/Util/include/Poco/Util/JSONConfiguration.h index b42f8971f3..663a6981b5 100644 --- a/Util/include/Poco/Util/JSONConfiguration.h +++ b/Util/include/Poco/Util/JSONConfiguration.h @@ -29,8 +29,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API JSONConfiguration : public AbstractConfiguration @@ -116,7 +115,7 @@ class Util_API JSONConfiguration : public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // POCO_UTIL_NO_JSONCONFIGURATION diff --git a/Util/include/Poco/Util/LayeredConfiguration.h b/Util/include/Poco/Util/LayeredConfiguration.h index c9198b118e..91fcadbd2c 100644 --- a/Util/include/Poco/Util/LayeredConfiguration.h +++ b/Util/include/Poco/Util/LayeredConfiguration.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API LayeredConfiguration: public AbstractConfiguration @@ -121,7 +120,7 @@ class Util_API LayeredConfiguration: public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_LayeredConfiguration_INCLUDED diff --git a/Util/include/Poco/Util/LocalConfigurationView.h b/Util/include/Poco/Util/LocalConfigurationView.h index 21c53bce6b..bf6de451cd 100644 --- a/Util/include/Poco/Util/LocalConfigurationView.h +++ b/Util/include/Poco/Util/LocalConfigurationView.h @@ -19,8 +19,7 @@ #include "Poco/Util/ConfigurationView.h" #include "Poco/Util/Util.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API LocalConfigurationView : public AbstractConfigurationView @@ -56,7 +55,7 @@ class Util_API LocalConfigurationView : public AbstractConfigurationView }; -}} // namespace Poco::Util +} // namespace Poco::Util #endif // Util_LocalConfigurationView_INCLUDED diff --git a/Util/include/Poco/Util/LoggingConfigurator.h b/Util/include/Poco/Util/LoggingConfigurator.h index c99223fc02..4f1229ddc5 100644 --- a/Util/include/Poco/Util/LoggingConfigurator.h +++ b/Util/include/Poco/Util/LoggingConfigurator.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API LoggingConfigurator @@ -166,7 +165,7 @@ class Util_API LoggingConfigurator }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_LoggingConfigurator_INCLUDED diff --git a/Util/include/Poco/Util/LoggingSubsystem.h b/Util/include/Poco/Util/LoggingSubsystem.h index d07cee7094..8128502b93 100644 --- a/Util/include/Poco/Util/LoggingSubsystem.h +++ b/Util/include/Poco/Util/LoggingSubsystem.h @@ -22,8 +22,7 @@ #include "Poco/Util/Subsystem.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API LoggingSubsystem: public Subsystem @@ -47,7 +46,7 @@ class Util_API LoggingSubsystem: public Subsystem }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_LoggingSubsystem_INCLUDED diff --git a/Util/include/Poco/Util/MapConfiguration.h b/Util/include/Poco/Util/MapConfiguration.h index ff6d133b1a..bae9b6a2b1 100644 --- a/Util/include/Poco/Util/MapConfiguration.h +++ b/Util/include/Poco/Util/MapConfiguration.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API MapConfiguration: public AbstractConfiguration @@ -67,7 +66,7 @@ class Util_API MapConfiguration: public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_MapConfiguration_INCLUDED diff --git a/Util/include/Poco/Util/Option.h b/Util/include/Poco/Util/Option.h index 949fe54340..8382d842e2 100644 --- a/Util/include/Poco/Util/Option.h +++ b/Util/include/Poco/Util/Option.h @@ -23,8 +23,7 @@ #include "Poco/Util/AbstractConfiguration.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Application; @@ -326,7 +325,7 @@ inline AbstractConfiguration::Ptr Option::config() const } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_Option_INCLUDED diff --git a/Util/include/Poco/Util/OptionCallback.h b/Util/include/Poco/Util/OptionCallback.h index b6796e0c26..085298d03a 100644 --- a/Util/include/Poco/Util/OptionCallback.h +++ b/Util/include/Poco/Util/OptionCallback.h @@ -21,8 +21,7 @@ #include "Poco/Util/Util.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API AbstractOptionCallback @@ -101,7 +100,7 @@ class OptionCallback: public AbstractOptionCallback }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_OptionCallback_INCLUDED diff --git a/Util/include/Poco/Util/OptionException.h b/Util/include/Poco/Util/OptionException.h index 35e7bff1d3..827bd15451 100644 --- a/Util/include/Poco/Util/OptionException.h +++ b/Util/include/Poco/Util/OptionException.h @@ -22,8 +22,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Util { +namespace Poco::Util { POCO_DECLARE_EXCEPTION(Util_API, OptionException, Poco::DataException) @@ -38,7 +37,7 @@ POCO_DECLARE_EXCEPTION(Util_API, DuplicateOptionException, OptionException) POCO_DECLARE_EXCEPTION(Util_API, EmptyOptionException, OptionException) -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_OptionException_INCLUDED diff --git a/Util/include/Poco/Util/OptionProcessor.h b/Util/include/Poco/Util/OptionProcessor.h index cd0669dd82..0062525438 100644 --- a/Util/include/Poco/Util/OptionProcessor.h +++ b/Util/include/Poco/Util/OptionProcessor.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class OptionSet; @@ -130,7 +129,7 @@ class Util_API OptionProcessor -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_OptionProcessor_INCLUDED diff --git a/Util/include/Poco/Util/OptionSet.h b/Util/include/Poco/Util/OptionSet.h index 9b989690c9..d24b5c73ac 100644 --- a/Util/include/Poco/Util/OptionSet.h +++ b/Util/include/Poco/Util/OptionSet.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API OptionSet @@ -88,7 +87,7 @@ class Util_API OptionSet }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_OptionSet_INCLUDED diff --git a/Util/include/Poco/Util/PropertyFileConfiguration.h b/Util/include/Poco/Util/PropertyFileConfiguration.h index cd8e3ce47c..e56e83c519 100644 --- a/Util/include/Poco/Util/PropertyFileConfiguration.h +++ b/Util/include/Poco/Util/PropertyFileConfiguration.h @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API PropertyFileConfiguration: public MapConfiguration @@ -93,7 +92,7 @@ class Util_API PropertyFileConfiguration: public MapConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_PropertyFileConfiguration_INCLUDED diff --git a/Util/include/Poco/Util/RegExpValidator.h b/Util/include/Poco/Util/RegExpValidator.h index 002c268b5c..6bbbae101f 100644 --- a/Util/include/Poco/Util/RegExpValidator.h +++ b/Util/include/Poco/Util/RegExpValidator.h @@ -22,8 +22,7 @@ #include "Poco/Util/Validator.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API RegExpValidator: public Validator @@ -48,7 +47,7 @@ class Util_API RegExpValidator: public Validator }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_RegExpValidator_INCLUDED diff --git a/Util/include/Poco/Util/ServerApplication.h b/Util/include/Poco/Util/ServerApplication.h index 312f21395b..5958f96f9d 100644 --- a/Util/include/Poco/Util/ServerApplication.h +++ b/Util/include/Poco/Util/ServerApplication.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API ServerApplication: public Application @@ -236,7 +235,7 @@ class Util_API ServerApplication: public Application }; -} } // namespace Poco::Util +} // namespace Poco::Util // diff --git a/Util/include/Poco/Util/Subsystem.h b/Util/include/Poco/Util/Subsystem.h index d103b16b29..717e4cde10 100644 --- a/Util/include/Poco/Util/Subsystem.h +++ b/Util/include/Poco/Util/Subsystem.h @@ -22,8 +22,7 @@ #include "Poco/RefCountedObject.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Application; @@ -92,7 +91,7 @@ class Util_API Subsystem: public Poco::RefCountedObject }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_Subsystem_INCLUDED diff --git a/Util/include/Poco/Util/SystemConfiguration.h b/Util/include/Poco/Util/SystemConfiguration.h index bb467cd50a..2b3d9fc44a 100644 --- a/Util/include/Poco/Util/SystemConfiguration.h +++ b/Util/include/Poco/Util/SystemConfiguration.h @@ -23,8 +23,7 @@ #include #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API SystemConfiguration: public AbstractConfiguration @@ -80,7 +79,7 @@ class Util_API SystemConfiguration: public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_SystemConfiguration_INCLUDED diff --git a/Util/include/Poco/Util/Timer.h b/Util/include/Poco/Util/Timer.h index b63a9204c1..feb9c184f9 100644 --- a/Util/include/Poco/Util/Timer.h +++ b/Util/include/Poco/Util/Timer.h @@ -25,8 +25,7 @@ #include "Poco/Runnable.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API Timer: protected Poco::Runnable @@ -210,7 +209,7 @@ inline std::size_t Timer::taskCount() const } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_Timer_INCLUDED diff --git a/Util/include/Poco/Util/TimerTask.h b/Util/include/Poco/Util/TimerTask.h index 11c76ddd0f..8b05558265 100644 --- a/Util/include/Poco/Util/TimerTask.h +++ b/Util/include/Poco/Util/TimerTask.h @@ -26,8 +26,7 @@ #include "Poco/Mutex.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API TimerTask: public Poco::RefCountedObject, public Poco::Runnable @@ -130,7 +129,7 @@ inline void TimerTask::updateLastExecution() } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_TimerTask_INCLUDED diff --git a/Util/include/Poco/Util/TimerTaskAdapter.h b/Util/include/Poco/Util/TimerTaskAdapter.h index 12af4df777..9a2a7e0bcf 100644 --- a/Util/include/Poco/Util/TimerTaskAdapter.h +++ b/Util/include/Poco/Util/TimerTaskAdapter.h @@ -22,8 +22,7 @@ #include "Poco/Util/TimerTask.h" -namespace Poco { -namespace Util { +namespace Poco::Util { template @@ -61,7 +60,7 @@ class TimerTaskAdapter: public TimerTask }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_TimerTaskAdapter_INCLUDED diff --git a/Util/include/Poco/Util/Units.h b/Util/include/Poco/Util/Units.h index 1b1c44262f..a1f878a876 100644 --- a/Util/include/Poco/Util/Units.h +++ b/Util/include/Poco/Util/Units.h @@ -35,18 +35,14 @@ #include -namespace Poco { -namespace Util { -namespace Units { +namespace Poco::Util::Units { - -namespace Internal -{ +namespace Internal { template struct Convert; struct None; template struct FixedPower; -} +} // namespace Internal template @@ -1299,7 +1295,7 @@ V tan(const Value& angle) } -} } } // namespace Poco::Util::Units +} // namespace Poco::Util::Units #endif // Util_Units_INCLUDED diff --git a/Util/include/Poco/Util/Validator.h b/Util/include/Poco/Util/Validator.h index 52adf85790..24b03da2b1 100644 --- a/Util/include/Poco/Util/Validator.h +++ b/Util/include/Poco/Util/Validator.h @@ -22,8 +22,7 @@ #include "Poco/RefCountedObject.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Option; @@ -51,7 +50,7 @@ class Util_API Validator: public Poco::RefCountedObject }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_Validator_INCLUDED diff --git a/Util/include/Poco/Util/WinRegistryConfiguration.h b/Util/include/Poco/Util/WinRegistryConfiguration.h index 442d59ed2f..4e07aedd65 100644 --- a/Util/include/Poco/Util/WinRegistryConfiguration.h +++ b/Util/include/Poco/Util/WinRegistryConfiguration.h @@ -23,8 +23,7 @@ #include "Poco/String.h" -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API WinRegistryConfiguration: public AbstractConfiguration @@ -65,7 +64,7 @@ class Util_API WinRegistryConfiguration: public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_WinRegistryConfiguration_INCLUDED diff --git a/Util/include/Poco/Util/WinRegistryKey.h b/Util/include/Poco/Util/WinRegistryKey.h index 99ed2e276c..0973416b42 100644 --- a/Util/include/Poco/Util/WinRegistryKey.h +++ b/Util/include/Poco/Util/WinRegistryKey.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API WinRegistryKey @@ -192,7 +191,7 @@ inline bool WinRegistryKey::isReadOnly() const } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_WinRegistryKey_INCLUDED diff --git a/Util/include/Poco/Util/WinService.h b/Util/include/Poco/Util/WinService.h index 8068e9bb42..71ef58076e 100644 --- a/Util/include/Poco/Util/WinService.h +++ b/Util/include/Poco/Util/WinService.h @@ -27,8 +27,7 @@ #define POCO_LPSERVICE_FAILURE_ACTION LPSERVICE_FAILURE_ACTIONSW -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API WinService @@ -167,7 +166,7 @@ class Util_API WinService }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // Util_WinService_INCLUDED diff --git a/Util/include/Poco/Util/XMLConfiguration.h b/Util/include/Poco/Util/XMLConfiguration.h index 49770e4855..523285718d 100644 --- a/Util/include/Poco/Util/XMLConfiguration.h +++ b/Util/include/Poco/Util/XMLConfiguration.h @@ -32,8 +32,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { class Util_API XMLConfiguration: public AbstractConfiguration @@ -182,7 +181,7 @@ class Util_API XMLConfiguration: public AbstractConfiguration }; -} } // namespace Poco::Util +} // namespace Poco::Util #endif // POCO_UTIL_NO_XMLCONFIGURATION diff --git a/Util/samples/Units/src/Units.cpp b/Util/samples/Units/src/Units.cpp index e44f8129f2..0fb62b93cc 100644 --- a/Util/samples/Units/src/Units.cpp +++ b/Util/samples/Units/src/Units.cpp @@ -22,15 +22,13 @@ using Poco::Util::Units::square; using Poco::Util::Units::cube; -namespace Poco { -namespace Util { -namespace Units { -namespace Units { +namespace Poco::Util::Units::Units { typedef Compose, Power > SpecificWeight;// [kN/m^3] -} // namespace Units -namespace Values { +} // namespace Poco::Util::Units::Units + +namespace Poco::Util::Units::Values { typedef Value SpecificWeight; -} } } } // namespace Poco::Util::Units +} // namespace Poco::Util::Units::Values int main() diff --git a/Util/src/AbstractConfiguration.cpp b/Util/src/AbstractConfiguration.cpp index fe88bf3cff..9bc415edee 100644 --- a/Util/src/AbstractConfiguration.cpp +++ b/Util/src/AbstractConfiguration.cpp @@ -30,8 +30,7 @@ using Poco::NumberFormatter; using Poco::icompare; -namespace Poco { -namespace Util { +namespace Poco::Util { AbstractConfiguration::AbstractConfiguration(): @@ -670,4 +669,4 @@ void AbstractConfiguration::setRawWithEvent(const std::string& key, std::string } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/Application.cpp b/Util/src/Application.cpp index 90a6dc63db..2c021a17cf 100644 --- a/Util/src/Application.cpp +++ b/Util/src/Application.cpp @@ -64,8 +64,7 @@ using Poco::icompare; using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { Application* Application::_pInstance = nullptr; @@ -561,4 +560,4 @@ void Application::setLogger(Logger& logger) } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/ConfigurationMapper.cpp b/Util/src/ConfigurationMapper.cpp index 8a457ce788..f8baafe245 100644 --- a/Util/src/ConfigurationMapper.cpp +++ b/Util/src/ConfigurationMapper.cpp @@ -15,8 +15,7 @@ #include "Poco/Util/ConfigurationMapper.h" -namespace Poco { -namespace Util { +namespace Poco::Util { ConfigurationMapper::ConfigurationMapper(const std::string& fromPrefix, const std::string& toPrefix, AbstractConfiguration::Ptr pConfig): @@ -90,4 +89,4 @@ std::string ConfigurationMapper::translateKey(const std::string& key) const } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/ConfigurationView.cpp b/Util/src/ConfigurationView.cpp index 0ac982de07..71f09913be 100644 --- a/Util/src/ConfigurationView.cpp +++ b/Util/src/ConfigurationView.cpp @@ -15,8 +15,7 @@ #include "Poco/Util/ConfigurationView.h" -namespace Poco { -namespace Util { +namespace Poco::Util { AbstractConfigurationView::AbstractConfigurationView(const std::string& prefix, AbstractConfiguration::Ptr pConfig): @@ -70,4 +69,4 @@ bool ConfigurationView::getRaw(const std::string& key, std::string& value) const } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/FastLoggerConfigurator.cpp b/Util/src/FastLoggerConfigurator.cpp index 6711437bc6..79b43e809b 100644 --- a/Util/src/FastLoggerConfigurator.cpp +++ b/Util/src/FastLoggerConfigurator.cpp @@ -27,8 +27,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { void FastLoggerConfigurator::configure(AbstractConfiguration::Ptr pConfig) @@ -114,7 +113,7 @@ void FastLoggerConfigurator::configureFastLogger(AbstractConfiguration::Ptr pCon } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // POCO_ENABLE_FASTLOGGER diff --git a/Util/src/FilesystemConfiguration.cpp b/Util/src/FilesystemConfiguration.cpp index 7c16317d0d..14b0dcc79d 100644 --- a/Util/src/FilesystemConfiguration.cpp +++ b/Util/src/FilesystemConfiguration.cpp @@ -27,8 +27,7 @@ using Poco::StringTokenizer; using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { FilesystemConfiguration::FilesystemConfiguration(const std::string& path): @@ -120,4 +119,4 @@ Path FilesystemConfiguration::keyToPath(const std::string& key) const } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/HelpFormatter.cpp b/Util/src/HelpFormatter.cpp index ae82941e6b..1c3d3c75a4 100644 --- a/Util/src/HelpFormatter.cpp +++ b/Util/src/HelpFormatter.cpp @@ -17,8 +17,7 @@ #include "Poco/Util/Option.h" -namespace Poco { -namespace Util { +namespace Poco::Util { const int HelpFormatter::TAB_WIDTH = 4; @@ -294,4 +293,4 @@ std::string HelpFormatter::longPrefix() const } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/IniFileConfiguration.cpp b/Util/src/IniFileConfiguration.cpp index 6f99c463bb..d8ce214453 100644 --- a/Util/src/IniFileConfiguration.cpp +++ b/Util/src/IniFileConfiguration.cpp @@ -31,8 +31,7 @@ using Poco::trim; using Poco::Path; -namespace Poco { -namespace Util { +namespace Poco::Util { IniFileConfiguration::IniFileConfiguration(std::istream& istr) @@ -180,7 +179,7 @@ void IniFileConfiguration::parseLine(std::istream& istr) } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // POCO_UTIL_NO_INIFILECONFIGURATION diff --git a/Util/src/IntValidator.cpp b/Util/src/IntValidator.cpp index 06c445c2ba..77278b63b4 100644 --- a/Util/src/IntValidator.cpp +++ b/Util/src/IntValidator.cpp @@ -23,8 +23,7 @@ using Poco::NumberParser; using Poco::format; -namespace Poco { -namespace Util { +namespace Poco::Util { IntValidator::IntValidator(int min, int max): @@ -46,4 +45,4 @@ void IntValidator::validate(const Option& option, const std::string& value) } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/JSONConfiguration.cpp b/Util/src/JSONConfiguration.cpp index 667a06eed0..17dc590006 100644 --- a/Util/src/JSONConfiguration.cpp +++ b/Util/src/JSONConfiguration.cpp @@ -30,8 +30,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { JSONConfiguration::JSONConfiguration() : _object(new JSON::Object()) @@ -379,7 +378,7 @@ void JSONConfiguration::removeRaw(const std::string& key) } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // POCO_UTIL_NO_JSONCONFIGURATION diff --git a/Util/src/LayeredConfiguration.cpp b/Util/src/LayeredConfiguration.cpp index 43990e59f4..27b44a6be3 100644 --- a/Util/src/LayeredConfiguration.cpp +++ b/Util/src/LayeredConfiguration.cpp @@ -21,8 +21,7 @@ using Poco::AutoPtr; using Poco::RuntimeException; -namespace Poco { -namespace Util { +namespace Poco::Util { void LayeredConfiguration::add(AbstractConfiguration::Ptr pConfig) @@ -178,4 +177,4 @@ int LayeredConfiguration::highest() const } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/LocalConfigurationView.cpp b/Util/src/LocalConfigurationView.cpp index 87f822052a..c80f10841d 100644 --- a/Util/src/LocalConfigurationView.cpp +++ b/Util/src/LocalConfigurationView.cpp @@ -14,8 +14,7 @@ #include "Poco/Util/LocalConfigurationView.h" -namespace Poco { -namespace Util { +namespace Poco::Util { LocalConfigurationView::LocalConfigurationView(const std::string& prefix, AbstractConfiguration::Ptr pConfig) : @@ -31,4 +30,4 @@ bool LocalConfigurationView::getRaw(const std::string& key, std::string& value) } -}} // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/LoggingConfigurator.cpp b/Util/src/LoggingConfigurator.cpp index 9d66636c0b..fdd94e983f 100644 --- a/Util/src/LoggingConfigurator.cpp +++ b/Util/src/LoggingConfigurator.cpp @@ -42,8 +42,7 @@ using Poco::LoggingFactory; using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { void LoggingConfigurator::configure(AbstractConfiguration::Ptr pConfig) @@ -252,4 +251,4 @@ void LoggingConfigurator::configure( } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/LoggingSubsystem.cpp b/Util/src/LoggingSubsystem.cpp index f0a62e595b..e7706a1529 100644 --- a/Util/src/LoggingSubsystem.cpp +++ b/Util/src/LoggingSubsystem.cpp @@ -23,8 +23,7 @@ using Poco::Logger; using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { const char* LoggingSubsystem::name() const @@ -49,4 +48,4 @@ void LoggingSubsystem::uninitialize() } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/MapConfiguration.cpp b/Util/src/MapConfiguration.cpp index 64be5edca7..a27ea139df 100644 --- a/Util/src/MapConfiguration.cpp +++ b/Util/src/MapConfiguration.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { void MapConfiguration::copyTo(AbstractConfiguration& config) @@ -99,4 +98,4 @@ void MapConfiguration::removeRaw(const std::string& key) } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/Option.cpp b/Util/src/Option.cpp index 2c9ee815e6..3281876d1f 100644 --- a/Util/src/Option.cpp +++ b/Util/src/Option.cpp @@ -23,8 +23,7 @@ using Poco::icompare; -namespace Poco { -namespace Util { +namespace Poco::Util { Option::Option(const Option& option): @@ -259,4 +258,4 @@ void Option::process(const std::string& option, std::string& arg) const } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/OptionCallback.cpp b/Util/src/OptionCallback.cpp index e1ff51753c..5e78d25306 100644 --- a/Util/src/OptionCallback.cpp +++ b/Util/src/OptionCallback.cpp @@ -15,8 +15,7 @@ #include "Poco/Util/OptionCallback.h" -namespace Poco { -namespace Util { +namespace Poco::Util { AbstractOptionCallback::~AbstractOptionCallback() @@ -24,4 +23,4 @@ AbstractOptionCallback::~AbstractOptionCallback() } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/OptionException.cpp b/Util/src/OptionException.cpp index cda4ed0b2d..b289a057c4 100644 --- a/Util/src/OptionException.cpp +++ b/Util/src/OptionException.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace Util { +namespace Poco::Util { POCO_IMPLEMENT_EXCEPTION(OptionException, Poco::DataException, "Option exception") @@ -32,4 +31,4 @@ POCO_IMPLEMENT_EXCEPTION(DuplicateOptionException, OptionException, "Option must POCO_IMPLEMENT_EXCEPTION(EmptyOptionException, OptionException, "Empty option specified") -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/OptionProcessor.cpp b/Util/src/OptionProcessor.cpp index 8f8f775636..333daa5a7d 100644 --- a/Util/src/OptionProcessor.cpp +++ b/Util/src/OptionProcessor.cpp @@ -18,8 +18,7 @@ #include "Poco/Util/OptionException.h" -namespace Poco { -namespace Util { +namespace Poco::Util { OptionProcessor::OptionProcessor(const OptionSet& options): @@ -145,4 +144,4 @@ bool OptionProcessor::processCommon(const std::string& optionStr, bool isShort, } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/OptionSet.cpp b/Util/src/OptionSet.cpp index 7e60696453..613993a883 100644 --- a/Util/src/OptionSet.cpp +++ b/Util/src/OptionSet.cpp @@ -17,8 +17,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Util { +namespace Poco::Util { void OptionSet::addOption(const Option& option) @@ -83,4 +82,4 @@ const Option& OptionSet::getOption(const std::string& name, bool matchShort) con } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/PropertyFileConfiguration.cpp b/Util/src/PropertyFileConfiguration.cpp index 254dadefdc..48e5c5632c 100644 --- a/Util/src/PropertyFileConfiguration.cpp +++ b/Util/src/PropertyFileConfiguration.cpp @@ -25,8 +25,7 @@ using Poco::trim; using Poco::Path; -namespace Poco { -namespace Util { +namespace Poco::Util { PropertyFileConfiguration::PropertyFileConfiguration(std::istream& istr) @@ -185,4 +184,4 @@ int PropertyFileConfiguration::readChar(std::istream& istr) } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/RegExpValidator.cpp b/Util/src/RegExpValidator.cpp index 24fd464616..af9d7bd98a 100644 --- a/Util/src/RegExpValidator.cpp +++ b/Util/src/RegExpValidator.cpp @@ -22,8 +22,7 @@ using Poco::format; -namespace Poco { -namespace Util { +namespace Poco::Util { RegExpValidator::RegExpValidator(const std::string& regexp): @@ -39,4 +38,4 @@ void RegExpValidator::validate(const Option& option, const std::string& value) } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/ServerApplication.cpp b/Util/src/ServerApplication.cpp index 58caa44aca..47932f5b35 100644 --- a/Util/src/ServerApplication.cpp +++ b/Util/src/ServerApplication.cpp @@ -49,8 +49,7 @@ using Poco::SystemException; using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { #if defined(POCO_OS_FAMILY_WINDOWS) @@ -574,4 +573,4 @@ void ServerApplication::handleUMask(const std::string& name, const std::string& #endif // POCO_OS_FAMILY_UNIX -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/Subsystem.cpp b/Util/src/Subsystem.cpp index 07cb81d478..b5f0395f34 100644 --- a/Util/src/Subsystem.cpp +++ b/Util/src/Subsystem.cpp @@ -15,8 +15,7 @@ #include "Poco/Util/Subsystem.h" -namespace Poco { -namespace Util { +namespace Poco::Util { void Subsystem::reinitialize(Application& app) @@ -31,4 +30,4 @@ void Subsystem::defineOptions(OptionSet& options) } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/SystemConfiguration.cpp b/Util/src/SystemConfiguration.cpp index c76a27a970..7bd29a5aee 100644 --- a/Util/src/SystemConfiguration.cpp +++ b/Util/src/SystemConfiguration.cpp @@ -36,8 +36,7 @@ using Poco::Path; using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { std::map> SystemConfiguration::_functions = { @@ -146,4 +145,4 @@ std::string SystemConfiguration::getNodeId() } } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/Timer.cpp b/Util/src/Timer.cpp index 16e4b856a5..b6e95fa880 100644 --- a/Util/src/Timer.cpp +++ b/Util/src/Timer.cpp @@ -21,8 +21,7 @@ using Poco::ErrorHandler; -namespace Poco { -namespace Util { +namespace Poco::Util { class TimerNotification: public Poco::Notification @@ -345,4 +344,4 @@ void Timer::validateTask(const TimerTask::Ptr& pTask) } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/TimerTask.cpp b/Util/src/TimerTask.cpp index dac3794d1c..a051b12fd7 100644 --- a/Util/src/TimerTask.cpp +++ b/Util/src/TimerTask.cpp @@ -15,8 +15,7 @@ #include "Poco/Util/TimerTask.h" -namespace Poco { -namespace Util { +namespace Poco::Util { TimerTask::TimerTask(): @@ -37,4 +36,4 @@ void TimerTask::cancel() } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/Validator.cpp b/Util/src/Validator.cpp index 19fa7d6308..000f9ffcc9 100644 --- a/Util/src/Validator.cpp +++ b/Util/src/Validator.cpp @@ -15,8 +15,7 @@ #include "Poco/Util/Validator.h" -namespace Poco { -namespace Util { +namespace Poco::Util { Validator::~Validator() @@ -24,4 +23,4 @@ Validator::~Validator() } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/WinRegistryConfiguration.cpp b/Util/src/WinRegistryConfiguration.cpp index 37dd8337c1..1c48c2a633 100644 --- a/Util/src/WinRegistryConfiguration.cpp +++ b/Util/src/WinRegistryConfiguration.cpp @@ -22,8 +22,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { WinRegistryConfiguration::WinRegistryConfiguration(const std::string& rootPath, REGSAM extraSam): _rootPath(rootPath), _extraSam(extraSam) @@ -132,4 +131,4 @@ std::string WinRegistryConfiguration::convertToRegFormat(const std::string& key, } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp index 369b04009c..768d5766f7 100644 --- a/Util/src/WinRegistryKey.cpp +++ b/Util/src/WinRegistryKey.cpp @@ -23,8 +23,7 @@ using Poco::NotFoundException; using Poco::InvalidArgumentException; -namespace Poco { -namespace Util { +namespace Poco::Util { namespace @@ -502,4 +501,4 @@ void WinRegistryKey::values(WinRegistryKey::Values& vals) } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/WinService.cpp b/Util/src/WinService.cpp index 0a4b88ba1b..d915cd804d 100644 --- a/Util/src/WinService.cpp +++ b/Util/src/WinService.cpp @@ -25,8 +25,7 @@ using Poco::NotFoundException; using Poco::OutOfMemoryException; -namespace Poco { -namespace Util { +namespace Poco::Util { const int WinService::STARTUP_TIMEOUT = 30000; @@ -417,4 +416,4 @@ POCO_LPQUERY_SERVICE_CONFIG WinService::config() const } -} } // namespace Poco::Util +} // namespace Poco::Util diff --git a/Util/src/XMLConfiguration.cpp b/Util/src/XMLConfiguration.cpp index 72ded30ef0..c1e928a231 100644 --- a/Util/src/XMLConfiguration.cpp +++ b/Util/src/XMLConfiguration.cpp @@ -33,8 +33,7 @@ using namespace std::string_literals; -namespace Poco { -namespace Util { +namespace Poco::Util { @@ -444,7 +443,7 @@ XMLConfiguration::Node* XMLConfiguration::findAttribute(const std::string& name, } -} } // namespace Poco::Util +} // namespace Poco::Util #endif // POCO_UTIL_NO_XMLCONFIGURATION diff --git a/XML/include/Poco/DOM/AbstractContainerNode.h b/XML/include/Poco/DOM/AbstractContainerNode.h index 96389ef01a..1830a4c040 100644 --- a/XML/include/Poco/DOM/AbstractContainerNode.h +++ b/XML/include/Poco/DOM/AbstractContainerNode.h @@ -22,8 +22,7 @@ #include "Poco/DOM/AbstractNode.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API AbstractContainerNode: public AbstractNode @@ -73,7 +72,7 @@ class XML_API AbstractContainerNode: public AbstractNode }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_AbstractContainerNode_INCLUDED diff --git a/XML/include/Poco/DOM/AbstractNode.h b/XML/include/Poco/DOM/AbstractNode.h index 99687e8bb7..912002f4f5 100644 --- a/XML/include/Poco/DOM/AbstractNode.h +++ b/XML/include/Poco/DOM/AbstractNode.h @@ -24,8 +24,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class AbstractContainerNode; @@ -120,7 +119,7 @@ class XML_API AbstractNode: public Node }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_AbstractNode_INCLUDED diff --git a/XML/include/Poco/DOM/Attr.h b/XML/include/Poco/DOM/Attr.h index 451e624653..48c8ad4c94 100644 --- a/XML/include/Poco/DOM/Attr.h +++ b/XML/include/Poco/DOM/Attr.h @@ -24,8 +24,7 @@ #include "Poco/XML/Name.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API Attr: public AbstractNode @@ -174,7 +173,7 @@ inline Element* Attr::ownerElement() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Attr_INCLUDED diff --git a/XML/include/Poco/DOM/AttrMap.h b/XML/include/Poco/DOM/AttrMap.h index f7d714bb8a..1c35fec9e0 100644 --- a/XML/include/Poco/DOM/AttrMap.h +++ b/XML/include/Poco/DOM/AttrMap.h @@ -22,8 +22,7 @@ #include "Poco/DOM/NamedNodeMap.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Element; @@ -59,7 +58,7 @@ class XML_API AttrMap: public NamedNodeMap }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_AttrMap_INCLUDED diff --git a/XML/include/Poco/DOM/AutoPtr.h b/XML/include/Poco/DOM/AutoPtr.h index 85f83d49f7..889d386a84 100644 --- a/XML/include/Poco/DOM/AutoPtr.h +++ b/XML/include/Poco/DOM/AutoPtr.h @@ -22,14 +22,13 @@ #include "Poco/AutoPtr.h" -namespace Poco { -namespace XML { +namespace Poco::XML { using Poco::AutoPtr; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DOMAutoPtr_INCLUDED diff --git a/XML/include/Poco/DOM/CDATASection.h b/XML/include/Poco/DOM/CDATASection.h index 93fed3b10a..b570b69684 100644 --- a/XML/include/Poco/DOM/CDATASection.h +++ b/XML/include/Poco/DOM/CDATASection.h @@ -22,8 +22,7 @@ #include "Poco/DOM/Text.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API CDATASection: public Text @@ -78,7 +77,7 @@ class XML_API CDATASection: public Text }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_CDATASection_INCLUDED diff --git a/XML/include/Poco/DOM/CharacterData.h b/XML/include/Poco/DOM/CharacterData.h index dc6144abee..78e392397d 100644 --- a/XML/include/Poco/DOM/CharacterData.h +++ b/XML/include/Poco/DOM/CharacterData.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API CharacterData: public AbstractNode @@ -117,7 +116,7 @@ inline unsigned long CharacterData::length() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_CharacterData_INCLUDED diff --git a/XML/include/Poco/DOM/ChildNodesList.h b/XML/include/Poco/DOM/ChildNodesList.h index d5a8088ce7..f8091fe75e 100644 --- a/XML/include/Poco/DOM/ChildNodesList.h +++ b/XML/include/Poco/DOM/ChildNodesList.h @@ -22,8 +22,7 @@ #include "Poco/DOM/NodeList.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API ChildNodesList: public NodeList @@ -49,7 +48,7 @@ class XML_API ChildNodesList: public NodeList }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_ChildNodesList_INCLUDED diff --git a/XML/include/Poco/DOM/Comment.h b/XML/include/Poco/DOM/Comment.h index 70294b560a..563cd70c72 100644 --- a/XML/include/Poco/DOM/Comment.h +++ b/XML/include/Poco/DOM/Comment.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API Comment: public CharacterData @@ -52,7 +51,7 @@ class XML_API Comment: public CharacterData }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Comment_INCLUDED diff --git a/XML/include/Poco/DOM/DOMBuilder.h b/XML/include/Poco/DOM/DOMBuilder.h index 92bd225fb7..0d3adba817 100644 --- a/XML/include/Poco/DOM/DOMBuilder.h +++ b/XML/include/Poco/DOM/DOMBuilder.h @@ -25,8 +25,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XMLReader; @@ -113,7 +112,7 @@ class XML_API DOMBuilder: protected DTDHandler, protected ContentHandler, protec }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DOMBuilder_INCLUDED diff --git a/XML/include/Poco/DOM/DOMException.h b/XML/include/Poco/DOM/DOMException.h index a6e0d45236..27dc723ec3 100644 --- a/XML/include/Poco/DOM/DOMException.h +++ b/XML/include/Poco/DOM/DOMException.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API DOMException: public XMLException @@ -106,7 +105,7 @@ inline unsigned short DOMException::code() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DOMException_INCLUDED diff --git a/XML/include/Poco/DOM/DOMImplementation.h b/XML/include/Poco/DOM/DOMImplementation.h index 74fb09f871..8890ca0328 100644 --- a/XML/include/Poco/DOM/DOMImplementation.h +++ b/XML/include/Poco/DOM/DOMImplementation.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class DocumentType; @@ -76,7 +75,7 @@ class XML_API DOMImplementation }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DOMImplementation_INCLUDED diff --git a/XML/include/Poco/DOM/DOMObject.h b/XML/include/Poco/DOM/DOMObject.h index ca39e2419d..98894fe18e 100644 --- a/XML/include/Poco/DOM/DOMObject.h +++ b/XML/include/Poco/DOM/DOMObject.h @@ -21,8 +21,7 @@ #include "Poco/XML/XML.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API DOMObject @@ -97,7 +96,7 @@ inline void DOMObject::release() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DOMObject_INCLUDED diff --git a/XML/include/Poco/DOM/DOMParser.h b/XML/include/Poco/DOM/DOMParser.h index 1e91e0d577..6080a198b2 100644 --- a/XML/include/Poco/DOM/DOMParser.h +++ b/XML/include/Poco/DOM/DOMParser.h @@ -22,8 +22,7 @@ #include "Poco/SAX/SAXParser.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class NamePool; @@ -126,7 +125,7 @@ class XML_API DOMParser }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DOMParser_INCLUDED diff --git a/XML/include/Poco/DOM/DOMSerializer.h b/XML/include/Poco/DOM/DOMSerializer.h index 7d2547c6e4..7ba8966452 100644 --- a/XML/include/Poco/DOM/DOMSerializer.h +++ b/XML/include/Poco/DOM/DOMSerializer.h @@ -20,8 +20,7 @@ #include "Poco/SAX/XMLReader.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Node; @@ -116,7 +115,7 @@ class XML_API DOMSerializer: public XMLReader }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DOMSerializer_INCLUDED diff --git a/XML/include/Poco/DOM/DOMWriter.h b/XML/include/Poco/DOM/DOMWriter.h index 59a2a0a096..00d70df241 100644 --- a/XML/include/Poco/DOM/DOMWriter.h +++ b/XML/include/Poco/DOM/DOMWriter.h @@ -24,8 +24,7 @@ #include "Poco/TextEncoding.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Node; @@ -121,7 +120,7 @@ inline const std::string& DOMWriter::getIndent() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DOMWriter_INCLUDED diff --git a/XML/include/Poco/DOM/DTDMap.h b/XML/include/Poco/DOM/DTDMap.h index 9ec1641728..595ab0d344 100644 --- a/XML/include/Poco/DOM/DTDMap.h +++ b/XML/include/Poco/DOM/DTDMap.h @@ -22,8 +22,7 @@ #include "Poco/DOM/NamedNodeMap.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class DocumentType; @@ -61,7 +60,7 @@ class XML_API DTDMap: public NamedNodeMap }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DTDMap_INCLUDED diff --git a/XML/include/Poco/DOM/Document.h b/XML/include/Poco/DOM/Document.h index b197061f77..7eaa9fe62e 100644 --- a/XML/include/Poco/DOM/Document.h +++ b/XML/include/Poco/DOM/Document.h @@ -27,8 +27,7 @@ #include "Poco/AutoReleasePool.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class NamePool; @@ -279,7 +278,7 @@ inline DocumentType* Document::getDoctype() } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Document_INCLUDED diff --git a/XML/include/Poco/DOM/DocumentEvent.h b/XML/include/Poco/DOM/DocumentEvent.h index 14bcf270b8..c2be80b485 100644 --- a/XML/include/Poco/DOM/DocumentEvent.h +++ b/XML/include/Poco/DOM/DocumentEvent.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Event; @@ -59,7 +58,7 @@ class XML_API DocumentEvent }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DocumentEvent_INCLUDED diff --git a/XML/include/Poco/DOM/DocumentFragment.h b/XML/include/Poco/DOM/DocumentFragment.h index 0adc48b964..23194471d6 100644 --- a/XML/include/Poco/DOM/DocumentFragment.h +++ b/XML/include/Poco/DOM/DocumentFragment.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API DocumentFragment: public AbstractContainerNode @@ -78,7 +77,7 @@ class XML_API DocumentFragment: public AbstractContainerNode }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DocumentFragment_INCLUDED diff --git a/XML/include/Poco/DOM/DocumentType.h b/XML/include/Poco/DOM/DocumentType.h index bf9d414a33..5426e07031 100644 --- a/XML/include/Poco/DOM/DocumentType.h +++ b/XML/include/Poco/DOM/DocumentType.h @@ -22,8 +22,7 @@ #include "Poco/DOM/AbstractContainerNode.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class NamedNodeMap; @@ -119,7 +118,7 @@ inline const XMLString& DocumentType::systemId() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_DocumentType_INCLUDED diff --git a/XML/include/Poco/DOM/Element.h b/XML/include/Poco/DOM/Element.h index 00e0b5a072..44c820b620 100644 --- a/XML/include/Poco/DOM/Element.h +++ b/XML/include/Poco/DOM/Element.h @@ -23,8 +23,7 @@ #include "Poco/XML/Name.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Attr; @@ -213,7 +212,7 @@ inline const XMLString& Element::tagName() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Element_INCLUDED diff --git a/XML/include/Poco/DOM/ElementsByTagNameList.h b/XML/include/Poco/DOM/ElementsByTagNameList.h index b377746fc3..f8b18e0013 100644 --- a/XML/include/Poco/DOM/ElementsByTagNameList.h +++ b/XML/include/Poco/DOM/ElementsByTagNameList.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API ElementsByTagNameList: public NodeList @@ -80,7 +79,7 @@ class XML_API ElementsByTagNameListNS: public NodeList }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_ElementsByTagNameList_INCLUDED diff --git a/XML/include/Poco/DOM/Entity.h b/XML/include/Poco/DOM/Entity.h index 8aa9226349..c90fddec14 100644 --- a/XML/include/Poco/DOM/Entity.h +++ b/XML/include/Poco/DOM/Entity.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API Entity: public AbstractContainerNode @@ -120,7 +119,7 @@ inline const XMLString& Entity::notationName() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Entity_INCLUDED diff --git a/XML/include/Poco/DOM/EntityReference.h b/XML/include/Poco/DOM/EntityReference.h index f2841880ec..be16ab9a8d 100644 --- a/XML/include/Poco/DOM/EntityReference.h +++ b/XML/include/Poco/DOM/EntityReference.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API EntityReference: public AbstractNode @@ -67,7 +66,7 @@ class XML_API EntityReference: public AbstractNode }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_EntityReference_INCLUDED diff --git a/XML/include/Poco/DOM/Event.h b/XML/include/Poco/DOM/Event.h index c1dfd250b5..b174b6e5bd 100644 --- a/XML/include/Poco/DOM/Event.h +++ b/XML/include/Poco/DOM/Event.h @@ -23,8 +23,7 @@ #include "Poco/DOM/DOMObject.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class EventTarget; @@ -203,7 +202,7 @@ inline bool Event::isStopped() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Event_INCLUDED diff --git a/XML/include/Poco/DOM/EventDispatcher.h b/XML/include/Poco/DOM/EventDispatcher.h index 46fdd8e46f..50c0f39aa7 100644 --- a/XML/include/Poco/DOM/EventDispatcher.h +++ b/XML/include/Poco/DOM/EventDispatcher.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { class Event; @@ -91,7 +90,7 @@ class XML_API EventDispatcher }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_EventDispatcher_INCLUDED diff --git a/XML/include/Poco/DOM/EventException.h b/XML/include/Poco/DOM/EventException.h index 503f37fdd9..9604f92d55 100644 --- a/XML/include/Poco/DOM/EventException.h +++ b/XML/include/Poco/DOM/EventException.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API EventException: public XMLException @@ -75,7 +74,7 @@ inline unsigned short EventException::code() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_EventException_INCLUDED diff --git a/XML/include/Poco/DOM/EventListener.h b/XML/include/Poco/DOM/EventListener.h index b788db0d4f..2c450cbe4c 100644 --- a/XML/include/Poco/DOM/EventListener.h +++ b/XML/include/Poco/DOM/EventListener.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Event; @@ -51,7 +50,7 @@ class XML_API EventListener }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_EventListener_INCLUDED diff --git a/XML/include/Poco/DOM/EventTarget.h b/XML/include/Poco/DOM/EventTarget.h index 438def4d93..da3b2ef815 100644 --- a/XML/include/Poco/DOM/EventTarget.h +++ b/XML/include/Poco/DOM/EventTarget.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class EventListener; @@ -70,7 +69,7 @@ class XML_API EventTarget: public DOMObject }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_EventTarget_INCLUDED diff --git a/XML/include/Poco/DOM/MutationEvent.h b/XML/include/Poco/DOM/MutationEvent.h index 12f25cda8f..5ae66a704a 100644 --- a/XML/include/Poco/DOM/MutationEvent.h +++ b/XML/include/Poco/DOM/MutationEvent.h @@ -22,8 +22,7 @@ #include "Poco/DOM/Event.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Node; @@ -137,7 +136,7 @@ inline MutationEvent::AttrChangeType MutationEvent::attrChange() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_MutationEvent_INCLUDED diff --git a/XML/include/Poco/DOM/NamedNodeMap.h b/XML/include/Poco/DOM/NamedNodeMap.h index e4d806e64f..623f21fe51 100644 --- a/XML/include/Poco/DOM/NamedNodeMap.h +++ b/XML/include/Poco/DOM/NamedNodeMap.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Node; @@ -87,7 +86,7 @@ class XML_API NamedNodeMap: public DOMObject }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_NamedNodeMap_INCLUDED diff --git a/XML/include/Poco/DOM/Node.h b/XML/include/Poco/DOM/Node.h index e65a9872f2..8a1dc100a9 100644 --- a/XML/include/Poco/DOM/Node.h +++ b/XML/include/Poco/DOM/Node.h @@ -24,8 +24,7 @@ #include "Poco/SAX/NamespaceSupport.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class NamedNodeMap; @@ -287,7 +286,7 @@ inline const XMLString& Node::nodeValue() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Node_INCLUDED diff --git a/XML/include/Poco/DOM/NodeAppender.h b/XML/include/Poco/DOM/NodeAppender.h index 14968aeaad..44ad24f613 100644 --- a/XML/include/Poco/DOM/NodeAppender.h +++ b/XML/include/Poco/DOM/NodeAppender.h @@ -22,8 +22,7 @@ #include "Poco/DOM/Node.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class AbstractNode; @@ -74,7 +73,7 @@ class XML_API NodeAppender }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // #include "Poco/XML/XML.h" diff --git a/XML/include/Poco/DOM/NodeFilter.h b/XML/include/Poco/DOM/NodeFilter.h index 8f895c95dc..3fa4f81c1e 100644 --- a/XML/include/Poco/DOM/NodeFilter.h +++ b/XML/include/Poco/DOM/NodeFilter.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Node; @@ -140,7 +139,7 @@ class XML_API NodeFilter }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_NodeFilter_INCLUDED diff --git a/XML/include/Poco/DOM/NodeIterator.h b/XML/include/Poco/DOM/NodeIterator.h index e51810e29c..00506c7936 100644 --- a/XML/include/Poco/DOM/NodeIterator.h +++ b/XML/include/Poco/DOM/NodeIterator.h @@ -21,8 +21,7 @@ #include "Poco/XML/XML.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Node; @@ -161,7 +160,7 @@ inline bool NodeIterator::expandEntityReferences() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_NodeIterator_INCLUDED diff --git a/XML/include/Poco/DOM/NodeList.h b/XML/include/Poco/DOM/NodeList.h index db7e86d6a9..7f4264ad88 100644 --- a/XML/include/Poco/DOM/NodeList.h +++ b/XML/include/Poco/DOM/NodeList.h @@ -22,8 +22,7 @@ #include "Poco/DOM/DOMObject.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Node; @@ -55,7 +54,7 @@ class XML_API NodeList: public DOMObject }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_NodeList_INCLUDED diff --git a/XML/include/Poco/DOM/Notation.h b/XML/include/Poco/DOM/Notation.h index 9506da8117..20c2c7760f 100644 --- a/XML/include/Poco/DOM/Notation.h +++ b/XML/include/Poco/DOM/Notation.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API Notation: public AbstractNode @@ -87,7 +86,7 @@ inline const XMLString& Notation::systemId() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Notation_INCLUDED diff --git a/XML/include/Poco/DOM/ProcessingInstruction.h b/XML/include/Poco/DOM/ProcessingInstruction.h index 76b7467d38..52dbefd833 100644 --- a/XML/include/Poco/DOM/ProcessingInstruction.h +++ b/XML/include/Poco/DOM/ProcessingInstruction.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API ProcessingInstruction: public AbstractNode @@ -93,7 +92,7 @@ inline const XMLString& ProcessingInstruction::getData() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_ProcessingInstruction_INCLUDED diff --git a/XML/include/Poco/DOM/Text.h b/XML/include/Poco/DOM/Text.h index 867414baa3..c20d56bf85 100644 --- a/XML/include/Poco/DOM/Text.h +++ b/XML/include/Poco/DOM/Text.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API Text: public CharacterData @@ -73,7 +72,7 @@ class XML_API Text: public CharacterData }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_Text_INCLUDED diff --git a/XML/include/Poco/DOM/TreeWalker.h b/XML/include/Poco/DOM/TreeWalker.h index 87250517ef..d54afa63cd 100644 --- a/XML/include/Poco/DOM/TreeWalker.h +++ b/XML/include/Poco/DOM/TreeWalker.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Node; @@ -205,7 +204,7 @@ inline Node* TreeWalker::getCurrentNode() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // DOM_TreeWalker_INCLUDED diff --git a/XML/include/Poco/SAX/Attributes.h b/XML/include/Poco/SAX/Attributes.h index 4b23281700..49d8b4b1fc 100644 --- a/XML/include/Poco/SAX/Attributes.h +++ b/XML/include/Poco/SAX/Attributes.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API Attributes @@ -114,7 +113,7 @@ class XML_API Attributes }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_Attributes_INCLUDED diff --git a/XML/include/Poco/SAX/AttributesImpl.h b/XML/include/Poco/SAX/AttributesImpl.h index 5a2a979971..84aa243621 100644 --- a/XML/include/Poco/SAX/AttributesImpl.h +++ b/XML/include/Poco/SAX/AttributesImpl.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API AttributesImpl: public Attributes @@ -301,7 +300,7 @@ inline bool AttributesImpl::isSpecified(const XMLString& namespaceURI, const XML } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_AttributesImpl_INCLUDED diff --git a/XML/include/Poco/SAX/ContentHandler.h b/XML/include/Poco/SAX/ContentHandler.h index b92978170e..4ca1dd9a04 100644 --- a/XML/include/Poco/SAX/ContentHandler.h +++ b/XML/include/Poco/SAX/ContentHandler.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class Locator; @@ -234,7 +233,7 @@ class XML_API ContentHandler }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_ContentHandler_INCLUDED diff --git a/XML/include/Poco/SAX/DTDHandler.h b/XML/include/Poco/SAX/DTDHandler.h index d40ba2ea15..f226bf15ce 100644 --- a/XML/include/Poco/SAX/DTDHandler.h +++ b/XML/include/Poco/SAX/DTDHandler.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API DTDHandler @@ -80,7 +79,7 @@ class XML_API DTDHandler }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_DTDHandler_INCLUDED diff --git a/XML/include/Poco/SAX/DeclHandler.h b/XML/include/Poco/SAX/DeclHandler.h index c842a8afa6..867fd119b5 100644 --- a/XML/include/Poco/SAX/DeclHandler.h +++ b/XML/include/Poco/SAX/DeclHandler.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API DeclHandler @@ -85,7 +84,7 @@ class XML_API DeclHandler }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_DeclHandler_INCLUDED diff --git a/XML/include/Poco/SAX/DefaultHandler.h b/XML/include/Poco/SAX/DefaultHandler.h index 5043e07349..68f9b028e8 100644 --- a/XML/include/Poco/SAX/DefaultHandler.h +++ b/XML/include/Poco/SAX/DefaultHandler.h @@ -25,8 +25,7 @@ #include "Poco/SAX/ErrorHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API DefaultHandler: public EntityResolver, public DTDHandler, public ContentHandler, public ErrorHandler @@ -77,7 +76,7 @@ class XML_API DefaultHandler: public EntityResolver, public DTDHandler, public C }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_DefaultHandler_INCLUDED diff --git a/XML/include/Poco/SAX/EntityResolver.h b/XML/include/Poco/SAX/EntityResolver.h index fc992727a0..ade6d3f016 100644 --- a/XML/include/Poco/SAX/EntityResolver.h +++ b/XML/include/Poco/SAX/EntityResolver.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class InputSource; @@ -80,7 +79,7 @@ class XML_API EntityResolver }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_EntityResolver_INCLUDED diff --git a/XML/include/Poco/SAX/EntityResolverImpl.h b/XML/include/Poco/SAX/EntityResolverImpl.h index b96f7e1562..6d965fccce 100644 --- a/XML/include/Poco/SAX/EntityResolverImpl.h +++ b/XML/include/Poco/SAX/EntityResolverImpl.h @@ -24,8 +24,7 @@ #include "Poco/URIStreamOpener.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API EntityResolverImpl: public EntityResolver @@ -72,7 +71,7 @@ class XML_API EntityResolverImpl: public EntityResolver }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_EntityResolverImpl_INCLUDED diff --git a/XML/include/Poco/SAX/ErrorHandler.h b/XML/include/Poco/SAX/ErrorHandler.h index 78d3123e81..62f464b1bd 100644 --- a/XML/include/Poco/SAX/ErrorHandler.h +++ b/XML/include/Poco/SAX/ErrorHandler.h @@ -21,8 +21,7 @@ #include "Poco/XML/XML.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class SAXException; @@ -86,7 +85,7 @@ class XML_API ErrorHandler }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_ErrorHandler_INCLUDED diff --git a/XML/include/Poco/SAX/InputSource.h b/XML/include/Poco/SAX/InputSource.h index 2196ecf681..1ccd8b7e23 100644 --- a/XML/include/Poco/SAX/InputSource.h +++ b/XML/include/Poco/SAX/InputSource.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLStream.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API InputSource @@ -163,7 +162,7 @@ inline XMLCharInputStream* InputSource::getCharacterStream() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_InputSource_INCLUDED diff --git a/XML/include/Poco/SAX/LexicalHandler.h b/XML/include/Poco/SAX/LexicalHandler.h index b26aa8b537..3ef9d5a030 100644 --- a/XML/include/Poco/SAX/LexicalHandler.h +++ b/XML/include/Poco/SAX/LexicalHandler.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API LexicalHandler @@ -119,7 +118,7 @@ class XML_API LexicalHandler }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_LexicalHandler_INCLUDED diff --git a/XML/include/Poco/SAX/Locator.h b/XML/include/Poco/SAX/Locator.h index be4da79be7..f56e7c215a 100644 --- a/XML/include/Poco/SAX/Locator.h +++ b/XML/include/Poco/SAX/Locator.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API Locator @@ -97,7 +96,7 @@ class XML_API Locator }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_Locator_INCLUDED diff --git a/XML/include/Poco/SAX/LocatorImpl.h b/XML/include/Poco/SAX/LocatorImpl.h index a131bb845c..f0953bd77d 100644 --- a/XML/include/Poco/SAX/LocatorImpl.h +++ b/XML/include/Poco/SAX/LocatorImpl.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API LocatorImpl: public Locator @@ -82,7 +81,7 @@ class XML_API LocatorImpl: public Locator }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_LocatorImpl_INCLUDED diff --git a/XML/include/Poco/SAX/NamespaceSupport.h b/XML/include/Poco/SAX/NamespaceSupport.h index 52d88b61ca..e3cf1172d9 100644 --- a/XML/include/Poco/SAX/NamespaceSupport.h +++ b/XML/include/Poco/SAX/NamespaceSupport.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API NamespaceSupport @@ -189,7 +188,7 @@ class XML_API NamespaceSupport }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_NamespaceSupport_INCLUDED diff --git a/XML/include/Poco/SAX/SAXException.h b/XML/include/Poco/SAX/SAXException.h index b313bc21a5..6320f56293 100644 --- a/XML/include/Poco/SAX/SAXException.h +++ b/XML/include/Poco/SAX/SAXException.h @@ -23,8 +23,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { POCO_DECLARE_EXCEPTION(XML_API, SAXException, XMLException) @@ -170,7 +169,7 @@ inline int SAXParseException::getColumnNumber() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_SAXException_INCLUDED diff --git a/XML/include/Poco/SAX/SAXParser.h b/XML/include/Poco/SAX/SAXParser.h index 5e966fce73..19f4087c33 100644 --- a/XML/include/Poco/SAX/SAXParser.h +++ b/XML/include/Poco/SAX/SAXParser.h @@ -23,8 +23,7 @@ #include "Poco/TextEncoding.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class ParserEngine; @@ -110,7 +109,7 @@ class XML_API SAXParser: public XMLReader }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_SAXParser_INCLUDED diff --git a/XML/include/Poco/SAX/WhitespaceFilter.h b/XML/include/Poco/SAX/WhitespaceFilter.h index b09e35037b..55d0318b95 100644 --- a/XML/include/Poco/SAX/WhitespaceFilter.h +++ b/XML/include/Poco/SAX/WhitespaceFilter.h @@ -23,8 +23,7 @@ #include "Poco/SAX/LexicalHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API WhitespaceFilter: public XMLFilterImpl, public LexicalHandler @@ -75,7 +74,7 @@ class XML_API WhitespaceFilter: public XMLFilterImpl, public LexicalHandler }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_WhitespaceFilter_INCLUDED diff --git a/XML/include/Poco/SAX/XMLFilter.h b/XML/include/Poco/SAX/XMLFilter.h index 1869adca31..814a365a30 100644 --- a/XML/include/Poco/SAX/XMLFilter.h +++ b/XML/include/Poco/SAX/XMLFilter.h @@ -22,8 +22,7 @@ #include "Poco/SAX/XMLReader.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API XMLFilter: public XMLReader @@ -55,7 +54,7 @@ class XML_API XMLFilter: public XMLReader }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_XMLFilter_INCLUDED diff --git a/XML/include/Poco/SAX/XMLFilterImpl.h b/XML/include/Poco/SAX/XMLFilterImpl.h index 6c6f9e6b4b..944fa63091 100644 --- a/XML/include/Poco/SAX/XMLFilterImpl.h +++ b/XML/include/Poco/SAX/XMLFilterImpl.h @@ -26,8 +26,7 @@ #include "Poco/SAX/ErrorHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API XMLFilterImpl: public XMLFilter, public EntityResolver, public DTDHandler, public ContentHandler, public ErrorHandler @@ -126,7 +125,7 @@ inline XMLReader* XMLFilterImpl::parent() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_XMLFilterImpl_INCLUDED diff --git a/XML/include/Poco/SAX/XMLReader.h b/XML/include/Poco/SAX/XMLReader.h index fb2dbbf97b..385c2fe57c 100644 --- a/XML/include/Poco/SAX/XMLReader.h +++ b/XML/include/Poco/SAX/XMLReader.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class EntityResolver; @@ -199,7 +198,7 @@ class XML_API XMLReader }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // SAX_XMLReader_INCLUDED diff --git a/XML/include/Poco/XML/Content.h b/XML/include/Poco/XML/Content.h index 8b2b312344..31020ce987 100644 --- a/XML/include/Poco/XML/Content.h +++ b/XML/include/Poco/XML/Content.h @@ -21,8 +21,7 @@ #define XML_Content_INCLUDED -namespace Poco { -namespace XML { +namespace Poco::XML { struct Content @@ -57,7 +56,7 @@ struct Content }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_Content_INCLUDED diff --git a/XML/include/Poco/XML/Name.h b/XML/include/Poco/XML/Name.h index d0abf7fe1e..3057d7ca9d 100644 --- a/XML/include/Poco/XML/Name.h +++ b/XML/include/Poco/XML/Name.h @@ -22,8 +22,7 @@ #include "Poco/XML/XMLString.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API Name @@ -138,7 +137,7 @@ inline void swap(Name& n1, Name& n2) noexcept } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_Name_INCLUDED diff --git a/XML/include/Poco/XML/NamePool.h b/XML/include/Poco/XML/NamePool.h index 97f32afdfb..2f7feddd45 100644 --- a/XML/include/Poco/XML/NamePool.h +++ b/XML/include/Poco/XML/NamePool.h @@ -28,8 +28,7 @@ #endif -namespace Poco { -namespace XML { +namespace Poco::XML { class NamePoolItem; @@ -77,7 +76,7 @@ class XML_API NamePool }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_NamePool_INCLUDED diff --git a/XML/include/Poco/XML/NamespaceStrategy.h b/XML/include/Poco/XML/NamespaceStrategy.h index 75bacf59a1..9bc92a54cd 100644 --- a/XML/include/Poco/XML/NamespaceStrategy.h +++ b/XML/include/Poco/XML/NamespaceStrategy.h @@ -24,8 +24,7 @@ #include "Poco/SAX/AttributesImpl.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class ContentHandler; @@ -109,7 +108,7 @@ class XML_API NamespacePrefixesStrategy: public NamespaceStrategy }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_NamespaceStrategy_INCLUDED diff --git a/XML/include/Poco/XML/QName.h b/XML/include/Poco/XML/QName.h index 90777bd1a8..66d35c52c9 100644 --- a/XML/include/Poco/XML/QName.h +++ b/XML/include/Poco/XML/QName.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API QName @@ -142,7 +141,7 @@ inline bool operator != (const QName& x, const QName& y) } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_QName_INCLUDED diff --git a/XML/include/Poco/XML/ValueTraits.h b/XML/include/Poco/XML/ValueTraits.h index 46631c9398..000d66b9f5 100644 --- a/XML/include/Poco/XML/ValueTraits.h +++ b/XML/include/Poco/XML/ValueTraits.h @@ -28,8 +28,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { class XMLStreamParser; @@ -98,7 +97,7 @@ T DefaultValueTraits::parse(std::string s, const XMLStreamParser& p) } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_ValueTraits_INCLUDED diff --git a/XML/include/Poco/XML/XMLException.h b/XML/include/Poco/XML/XMLException.h index 9805badf06..a38dc00fa1 100644 --- a/XML/include/Poco/XML/XMLException.h +++ b/XML/include/Poco/XML/XMLException.h @@ -22,8 +22,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace XML { +namespace Poco::XML { POCO_DECLARE_EXCEPTION(XML_API, XMLException, Poco::RuntimeException) @@ -31,7 +30,7 @@ POCO_DECLARE_EXCEPTION(XML_API, XMLException, Poco::RuntimeException) /// and DOMException. -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_XMLException_INCLUDED diff --git a/XML/include/Poco/XML/XMLStream.h b/XML/include/Poco/XML/XMLStream.h index 23a3999af1..9003d1dce2 100644 --- a/XML/include/Poco/XML/XMLStream.h +++ b/XML/include/Poco/XML/XMLStream.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { // The byte input stream is always a narrow stream. @@ -65,7 +64,7 @@ using XMLByteOutputStream = std::ostream; #endif -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_XMLStream_INCLUDED diff --git a/XML/include/Poco/XML/XMLStreamParser.h b/XML/include/Poco/XML/XMLStreamParser.h index e965ea42f5..fdcd57cf6b 100644 --- a/XML/include/Poco/XML/XMLStreamParser.h +++ b/XML/include/Poco/XML/XMLStreamParser.h @@ -41,8 +41,7 @@ struct XML_ParserStruct; -namespace Poco { -namespace XML { +namespace Poco::XML { class XML_API XMLStreamParser @@ -635,7 +634,7 @@ T XMLStreamParser::element(const QName& qn, const T& dv) } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_XMLStreamParser_INCLUDED diff --git a/XML/include/Poco/XML/XMLStreamParserException.h b/XML/include/Poco/XML/XMLStreamParserException.h index 88e4ff3304..5f2037b2e4 100644 --- a/XML/include/Poco/XML/XMLStreamParserException.h +++ b/XML/include/Poco/XML/XMLStreamParserException.h @@ -21,8 +21,7 @@ #include "Poco/XML/XMLException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class XMLStreamParser; @@ -52,7 +51,7 @@ class XML_API XMLStreamParserException: public Poco::XML::XMLException }; -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_XMLStreamParserException_INCLUDED diff --git a/XML/include/Poco/XML/XMLString.h b/XML/include/Poco/XML/XMLString.h index 3383f21f01..6f683f6c86 100644 --- a/XML/include/Poco/XML/XMLString.h +++ b/XML/include/Poco/XML/XMLString.h @@ -21,8 +21,7 @@ #include "Poco/XML/XML.h" -namespace Poco { -namespace XML { +namespace Poco::XML { // @@ -81,7 +80,7 @@ namespace XML { #endif -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_XMLString_INCLUDED diff --git a/XML/include/Poco/XML/XMLWriter.h b/XML/include/Poco/XML/XMLWriter.h index 5996361eb5..f71be7fd32 100644 --- a/XML/include/Poco/XML/XMLWriter.h +++ b/XML/include/Poco/XML/XMLWriter.h @@ -32,8 +32,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { class Locator; @@ -369,7 +368,7 @@ inline int XMLWriter::depth() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_XMLWriter_INCLUDED diff --git a/XML/src/AbstractContainerNode.cpp b/XML/src/AbstractContainerNode.cpp index 6fae9b9796..2a0208d6f7 100644 --- a/XML/src/AbstractContainerNode.cpp +++ b/XML/src/AbstractContainerNode.cpp @@ -23,8 +23,7 @@ #include "Poco/UnicodeConverter.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString AbstractContainerNode::WILDCARD(toXMLString("*")); @@ -651,4 +650,4 @@ bool AbstractContainerNode::namesAreEqual(const Node* pNode, const XMLString& na } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/AbstractNode.cpp b/XML/src/AbstractNode.cpp index ffc2ce8a26..51155acda7 100644 --- a/XML/src/AbstractNode.cpp +++ b/XML/src/AbstractNode.cpp @@ -24,8 +24,7 @@ #include "Poco/DOM/AutoPtr.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString AbstractNode::NODE_NAME = toXMLString("#node"); @@ -370,4 +369,4 @@ void AbstractNode::setOwnerDocument(Document* pOwnerDocument) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Attr.cpp b/XML/src/Attr.cpp index 8ebe3740fa..c492b951c7 100644 --- a/XML/src/Attr.cpp +++ b/XML/src/Attr.cpp @@ -17,8 +17,7 @@ #include "Poco/XML/NamePool.h" -namespace Poco { -namespace XML { +namespace Poco::XML { Attr::Attr(Document* pOwnerDocument, Element* pOwnerElement, const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname, const XMLString& value, bool specified): @@ -130,4 +129,4 @@ Node* Attr::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/AttrMap.cpp b/XML/src/AttrMap.cpp index 527f146b8e..42ee857adf 100644 --- a/XML/src/AttrMap.cpp +++ b/XML/src/AttrMap.cpp @@ -19,8 +19,7 @@ #include "Poco/DOM/DOMException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { AttrMap::AttrMap(Element* pElement): @@ -119,5 +118,5 @@ void AttrMap::autoRelease() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Attributes.cpp b/XML/src/Attributes.cpp index f2baf9ff20..6d8f3c9d15 100644 --- a/XML/src/Attributes.cpp +++ b/XML/src/Attributes.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/Attributes.h" -namespace Poco { -namespace XML { +namespace Poco::XML { Attributes::~Attributes() @@ -24,4 +23,4 @@ Attributes::~Attributes() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/AttributesImpl.cpp b/XML/src/AttributesImpl.cpp index f833d38f25..8a836b63c4 100644 --- a/XML/src/AttributesImpl.cpp +++ b/XML/src/AttributesImpl.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/AttributesImpl.h" -namespace Poco { -namespace XML { +namespace Poco::XML { AttributesImpl::EmptyAttribute::EmptyAttribute() @@ -296,4 +295,4 @@ AttributesImpl::Attribute* AttributesImpl::find(const XMLString& namespaceURI, c } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/CDATASection.cpp b/XML/src/CDATASection.cpp index 8c4c243629..ebef483f84 100644 --- a/XML/src/CDATASection.cpp +++ b/XML/src/CDATASection.cpp @@ -17,8 +17,7 @@ #include "Poco/DOM/DOMException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString CDATASection::NODE_NAME = toXMLString("#cdata-section"); @@ -71,4 +70,4 @@ Node* CDATASection::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/CharacterData.cpp b/XML/src/CharacterData.cpp index 3852c099b4..f16f33dc2f 100644 --- a/XML/src/CharacterData.cpp +++ b/XML/src/CharacterData.cpp @@ -17,8 +17,7 @@ #include "Poco/String.h" -namespace Poco { -namespace XML { +namespace Poco::XML { CharacterData::CharacterData(Document* pOwnerDocument, const XMLString& data): @@ -149,4 +148,4 @@ XMLString CharacterData::trimmedData() const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/ChildNodesList.cpp b/XML/src/ChildNodesList.cpp index aeacaf15ad..01a1d94524 100644 --- a/XML/src/ChildNodesList.cpp +++ b/XML/src/ChildNodesList.cpp @@ -17,8 +17,7 @@ #include "Poco/DOM/Document.h" -namespace Poco { -namespace XML { +namespace Poco::XML { ChildNodesList::ChildNodesList(const Node* pParent): @@ -67,4 +66,4 @@ void ChildNodesList::autoRelease() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Comment.cpp b/XML/src/Comment.cpp index e66499c317..a8b8c50e50 100644 --- a/XML/src/Comment.cpp +++ b/XML/src/Comment.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/Comment.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString Comment::NODE_NAME = toXMLString("#comment"); @@ -57,4 +56,4 @@ Node* Comment::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/ContentHandler.cpp b/XML/src/ContentHandler.cpp index 03177d11e7..c2f96dc370 100644 --- a/XML/src/ContentHandler.cpp +++ b/XML/src/ContentHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/ContentHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { ContentHandler::~ContentHandler() @@ -24,4 +23,4 @@ ContentHandler::~ContentHandler() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DOMBuilder.cpp b/XML/src/DOMBuilder.cpp index bbd2cb715a..dcdd7ac853 100644 --- a/XML/src/DOMBuilder.cpp +++ b/XML/src/DOMBuilder.cpp @@ -31,8 +31,7 @@ #include "Poco/XML/XMLException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString DOMBuilder::EMPTY_STRING; @@ -317,4 +316,4 @@ void DOMBuilder::comment(const XMLChar ch[], int start, int length) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DOMException.cpp b/XML/src/DOMException.cpp index e99d9d64f1..9bf987ee08 100644 --- a/XML/src/DOMException.cpp +++ b/XML/src/DOMException.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { const std::string DOMException::MESSAGES[_NUMBER_OF_MESSAGES] = @@ -104,4 +103,4 @@ const std::string& DOMException::message(unsigned short code) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DOMImplementation.cpp b/XML/src/DOMImplementation.cpp index 6c986c2fef..63aba1d064 100644 --- a/XML/src/DOMImplementation.cpp +++ b/XML/src/DOMImplementation.cpp @@ -19,8 +19,7 @@ #include "Poco/String.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString DOMImplementation::FEATURE_XML = toXMLString("xml"); @@ -77,4 +76,4 @@ const DOMImplementation& DOMImplementation::instance() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DOMObject.cpp b/XML/src/DOMObject.cpp index 06f091f0de..e504f9993f 100644 --- a/XML/src/DOMObject.cpp +++ b/XML/src/DOMObject.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/DOMObject.h" -namespace Poco { -namespace XML { +namespace Poco::XML { DOMObject::DOMObject(): _rc(1) @@ -29,4 +28,4 @@ DOMObject::~DOMObject() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DOMParser.cpp b/XML/src/DOMParser.cpp index d5cb6048bb..c3ae293aae 100644 --- a/XML/src/DOMParser.cpp +++ b/XML/src/DOMParser.cpp @@ -20,8 +20,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString DOMParser::FEATURE_FILTER_WHITESPACE = toXMLString("http://www.appinf.com/features/no-whitespace-in-element-content"); @@ -164,4 +163,4 @@ std::size_t DOMParser::getMaxElementDepth() const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DOMSerializer.cpp b/XML/src/DOMSerializer.cpp index a3d2ea3e52..4eb57be7e6 100644 --- a/XML/src/DOMSerializer.cpp +++ b/XML/src/DOMSerializer.cpp @@ -35,8 +35,7 @@ #include "Poco/SAX/SAXException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString DOMSerializer::CDATA = toXMLString("CDATA"); @@ -320,4 +319,4 @@ void DOMSerializer::handleEntity(const Entity* pEntity) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DOMWriter.cpp b/XML/src/DOMWriter.cpp index 5325e866f1..96e43fd954 100644 --- a/XML/src/DOMWriter.cpp +++ b/XML/src/DOMWriter.cpp @@ -26,8 +26,7 @@ #include "Poco/FileStream.h" -namespace Poco { -namespace XML { +namespace Poco::XML { DOMWriter::DOMWriter(): @@ -98,5 +97,5 @@ void DOMWriter::writeNode(const std::string& systemId, const Node* pNode) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DTDHandler.cpp b/XML/src/DTDHandler.cpp index 5c478acc40..8efd54b5d0 100644 --- a/XML/src/DTDHandler.cpp +++ b/XML/src/DTDHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/DTDHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { DTDHandler::~DTDHandler() @@ -24,4 +23,4 @@ DTDHandler::~DTDHandler() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DTDMap.cpp b/XML/src/DTDMap.cpp index 0ccdda20c6..ad78b88374 100644 --- a/XML/src/DTDMap.cpp +++ b/XML/src/DTDMap.cpp @@ -18,8 +18,7 @@ #include "Poco/DOM/DOMException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { DTDMap::DTDMap(const DocumentType* pDocumentType, unsigned short type): @@ -114,4 +113,4 @@ void DTDMap::autoRelease() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DeclHandler.cpp b/XML/src/DeclHandler.cpp index d2164f430f..5a9bf6b970 100644 --- a/XML/src/DeclHandler.cpp +++ b/XML/src/DeclHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/DeclHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { DeclHandler::~DeclHandler() @@ -24,4 +23,4 @@ DeclHandler::~DeclHandler() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DefaultHandler.cpp b/XML/src/DefaultHandler.cpp index a7be727e8f..4fe17584ff 100644 --- a/XML/src/DefaultHandler.cpp +++ b/XML/src/DefaultHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/DefaultHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { DefaultHandler::DefaultHandler() @@ -120,4 +119,4 @@ void DefaultHandler::fatalError(const SAXException& exc) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Document.cpp b/XML/src/Document.cpp index 0781091fe2..59561f8153 100644 --- a/XML/src/Document.cpp +++ b/XML/src/Document.cpp @@ -31,8 +31,7 @@ #include "Poco/XML/NamePool.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString Document::NODE_NAME = toXMLString("#document"); @@ -323,4 +322,4 @@ Element* Document::getElementByIdNS(const XMLString& elementId, const XMLString& } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DocumentEvent.cpp b/XML/src/DocumentEvent.cpp index 943e69f67d..802a36fe71 100644 --- a/XML/src/DocumentEvent.cpp +++ b/XML/src/DocumentEvent.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/DocumentEvent.h" -namespace Poco { -namespace XML { +namespace Poco::XML { DocumentEvent::~DocumentEvent() @@ -24,4 +23,4 @@ DocumentEvent::~DocumentEvent() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DocumentFragment.cpp b/XML/src/DocumentFragment.cpp index 1a2a21c705..cac91b34bc 100644 --- a/XML/src/DocumentFragment.cpp +++ b/XML/src/DocumentFragment.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/DocumentFragment.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString DocumentFragment::NODE_NAME = toXMLString("#document-fragment"); @@ -67,4 +66,4 @@ Node* DocumentFragment::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/DocumentType.cpp b/XML/src/DocumentType.cpp index bd07be6bae..22e4498a20 100644 --- a/XML/src/DocumentType.cpp +++ b/XML/src/DocumentType.cpp @@ -18,8 +18,7 @@ #include "Poco/DOM/DOMException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { DocumentType::DocumentType(Document* pOwner, const XMLString& name, const XMLString& publicId, const XMLString& systemId): @@ -81,4 +80,4 @@ Node* DocumentType::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Element.cpp b/XML/src/Element.cpp index a6bd8febb4..37504e3883 100644 --- a/XML/src/Element.cpp +++ b/XML/src/Element.cpp @@ -21,8 +21,7 @@ #include "Poco/DOM/AttrMap.h" -namespace Poco { -namespace XML { +namespace Poco::XML { Element::Element(Document* pOwnerDocument, const XMLString& namespaceURI, const XMLString& localName, const XMLString& qname): @@ -441,4 +440,4 @@ Element* Element::getElementByIdNS(const XMLString& elementId, const XMLString& } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/ElementsByTagNameList.cpp b/XML/src/ElementsByTagNameList.cpp index 1845bbe77f..40bea7532f 100644 --- a/XML/src/ElementsByTagNameList.cpp +++ b/XML/src/ElementsByTagNameList.cpp @@ -18,8 +18,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { ElementsByTagNameList::ElementsByTagNameList(const Node* pParent, const XMLString& name): @@ -148,4 +147,4 @@ void ElementsByTagNameListNS::autoRelease() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Entity.cpp b/XML/src/Entity.cpp index 43a748395b..4183a49e2b 100644 --- a/XML/src/Entity.cpp +++ b/XML/src/Entity.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/Entity.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString Entity::NODE_NAME = toXMLString("#entity"); @@ -65,4 +64,4 @@ Node* Entity::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/EntityReference.cpp b/XML/src/EntityReference.cpp index 702946919b..367933a5a2 100644 --- a/XML/src/EntityReference.cpp +++ b/XML/src/EntityReference.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/EntityReference.h" -namespace Poco { -namespace XML { +namespace Poco::XML { EntityReference::EntityReference(Document* pOwnerDocument, const XMLString& name): @@ -56,4 +55,4 @@ Node* EntityReference::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/EntityResolver.cpp b/XML/src/EntityResolver.cpp index 80e1bde9c2..2ac1a67140 100644 --- a/XML/src/EntityResolver.cpp +++ b/XML/src/EntityResolver.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/EntityResolver.h" -namespace Poco { -namespace XML { +namespace Poco::XML { EntityResolver::~EntityResolver() @@ -24,4 +23,4 @@ EntityResolver::~EntityResolver() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/EntityResolverImpl.cpp b/XML/src/EntityResolverImpl.cpp index de940b1891..1af1c1cf24 100644 --- a/XML/src/EntityResolverImpl.cpp +++ b/XML/src/EntityResolverImpl.cpp @@ -28,8 +28,7 @@ using Poco::IOException; using Poco::OpenFileException; -namespace Poco { -namespace XML { +namespace Poco::XML { EntityResolverImpl::EntityResolverImpl(): @@ -75,4 +74,4 @@ std::istream* EntityResolverImpl::resolveSystemId(const XMLString& systemId) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/ErrorHandler.cpp b/XML/src/ErrorHandler.cpp index 6a497a3816..a9ddaaf0e6 100644 --- a/XML/src/ErrorHandler.cpp +++ b/XML/src/ErrorHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/ErrorHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { ErrorHandler::~ErrorHandler() @@ -24,4 +23,4 @@ ErrorHandler::~ErrorHandler() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Event.cpp b/XML/src/Event.cpp index c277d65485..3d1854ed29 100644 --- a/XML/src/Event.cpp +++ b/XML/src/Event.cpp @@ -16,8 +16,7 @@ #include "Poco/DOM/Document.h" -namespace Poco { -namespace XML { +namespace Poco::XML { Event::Event(Document* pOwnerDocument, const XMLString& type): @@ -99,4 +98,4 @@ void Event::autoRelease() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/EventDispatcher.cpp b/XML/src/EventDispatcher.cpp index 93133061e2..d7272b86bb 100644 --- a/XML/src/EventDispatcher.cpp +++ b/XML/src/EventDispatcher.cpp @@ -39,8 +39,7 @@ namespace } -namespace Poco { -namespace XML { +namespace Poco::XML { EventDispatcher::EventDispatcher(): @@ -143,4 +142,4 @@ void EventDispatcher::bubbleEvent(Event* evt) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/EventException.cpp b/XML/src/EventException.cpp index 844165701f..5a3c3b7916 100644 --- a/XML/src/EventException.cpp +++ b/XML/src/EventException.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { EventException::EventException(int code): @@ -62,4 +61,4 @@ Poco::Exception* EventException::clone() const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/EventListener.cpp b/XML/src/EventListener.cpp index b6c3988818..6dd4f5f8b1 100644 --- a/XML/src/EventListener.cpp +++ b/XML/src/EventListener.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/EventListener.h" -namespace Poco { -namespace XML { +namespace Poco::XML { EventListener::~EventListener() @@ -24,4 +23,4 @@ EventListener::~EventListener() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/EventTarget.cpp b/XML/src/EventTarget.cpp index 2aa76a0dad..e431dcb5f2 100644 --- a/XML/src/EventTarget.cpp +++ b/XML/src/EventTarget.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/EventTarget.h" -namespace Poco { -namespace XML { +namespace Poco::XML { EventTarget::~EventTarget() @@ -24,4 +23,4 @@ EventTarget::~EventTarget() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/InputSource.cpp b/XML/src/InputSource.cpp index 54dc42050b..209f910de1 100644 --- a/XML/src/InputSource.cpp +++ b/XML/src/InputSource.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/InputSource.h" -namespace Poco { -namespace XML { +namespace Poco::XML { InputSource::InputSource(): @@ -76,5 +75,5 @@ void InputSource::setCharacterStream(XMLCharInputStream& cistr) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/LexicalHandler.cpp b/XML/src/LexicalHandler.cpp index 52de41d742..5c3f5c27fc 100644 --- a/XML/src/LexicalHandler.cpp +++ b/XML/src/LexicalHandler.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/LexicalHandler.h" -namespace Poco { -namespace XML { +namespace Poco::XML { LexicalHandler::~LexicalHandler() @@ -24,4 +23,4 @@ LexicalHandler::~LexicalHandler() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Locator.cpp b/XML/src/Locator.cpp index 3be93bf795..8939b55892 100644 --- a/XML/src/Locator.cpp +++ b/XML/src/Locator.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/Locator.h" -namespace Poco { -namespace XML { +namespace Poco::XML { Locator::~Locator() @@ -24,4 +23,4 @@ Locator::~Locator() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/LocatorImpl.cpp b/XML/src/LocatorImpl.cpp index a77cc43f60..04a3f4860f 100644 --- a/XML/src/LocatorImpl.cpp +++ b/XML/src/LocatorImpl.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/LocatorImpl.h" -namespace Poco { -namespace XML { +namespace Poco::XML { LocatorImpl::LocatorImpl() @@ -101,4 +100,4 @@ void LocatorImpl::setColumnNumber(int columnNumber) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/MutationEvent.cpp b/XML/src/MutationEvent.cpp index bc723c6be5..366598a2b6 100644 --- a/XML/src/MutationEvent.cpp +++ b/XML/src/MutationEvent.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/MutationEvent.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString MutationEvent::DOMSubtreeModified = toXMLString("DOMSubtreeModified"); @@ -73,4 +72,4 @@ void MutationEvent::initMutationEvent(const XMLString& type, bool canBubble, boo } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Name.cpp b/XML/src/Name.cpp index dfc184f955..5dcd291703 100644 --- a/XML/src/Name.cpp +++ b/XML/src/Name.cpp @@ -16,8 +16,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString Name::EMPTY_NAME; @@ -185,4 +184,4 @@ XMLString Name::prefix(const XMLString& qname) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/NamePool.cpp b/XML/src/NamePool.cpp index e4284f7440..fa9c605ffb 100644 --- a/XML/src/NamePool.cpp +++ b/XML/src/NamePool.cpp @@ -17,8 +17,7 @@ #include "Poco/Random.h" -namespace Poco { -namespace XML { +namespace Poco::XML { class NamePoolItem @@ -129,4 +128,4 @@ unsigned long NamePool::hash(const XMLString& qname, const XMLString& namespaceU } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/NamedNodeMap.cpp b/XML/src/NamedNodeMap.cpp index 91108bf534..6dc98852b3 100644 --- a/XML/src/NamedNodeMap.cpp +++ b/XML/src/NamedNodeMap.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/NamedNodeMap.h" -namespace Poco { -namespace XML { +namespace Poco::XML { NamedNodeMap::~NamedNodeMap() @@ -24,4 +23,4 @@ NamedNodeMap::~NamedNodeMap() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/NamespaceStrategy.cpp b/XML/src/NamespaceStrategy.cpp index ef7af31556..43e22b4ba0 100644 --- a/XML/src/NamespaceStrategy.cpp +++ b/XML/src/NamespaceStrategy.cpp @@ -19,8 +19,7 @@ #include "Poco/XML/Name.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString NamespaceStrategy::NOTHING; @@ -192,4 +191,4 @@ void NamespacePrefixesStrategy::endElement(const XMLChar* name, ContentHandler* } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/NamespaceSupport.cpp b/XML/src/NamespaceSupport.cpp index d06837dd11..dd60beef5f 100644 --- a/XML/src/NamespaceSupport.cpp +++ b/XML/src/NamespaceSupport.cpp @@ -16,8 +16,7 @@ #include "Poco/XML/Name.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString NamespaceSupport::EMPTY_STRING; @@ -184,4 +183,4 @@ void NamespaceSupport::reset() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Node.cpp b/XML/src/Node.cpp index 4134fcfa29..52e9d1ab08 100644 --- a/XML/src/Node.cpp +++ b/XML/src/Node.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/Node.h" -namespace Poco { -namespace XML { +namespace Poco::XML { Node::~Node() @@ -24,4 +23,4 @@ Node::~Node() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/NodeAppender.cpp b/XML/src/NodeAppender.cpp index 38b63cc73a..6d0e7c44a8 100644 --- a/XML/src/NodeAppender.cpp +++ b/XML/src/NodeAppender.cpp @@ -17,8 +17,7 @@ #include "Poco/DOM/DOMException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { NodeAppender::NodeAppender(Element* parent): @@ -79,4 +78,4 @@ void NodeAppender::appendChild(Node* newChild) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/NodeFilter.cpp b/XML/src/NodeFilter.cpp index 7239f43407..ca56157d69 100644 --- a/XML/src/NodeFilter.cpp +++ b/XML/src/NodeFilter.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/NodeFilter.h" -namespace Poco { -namespace XML { +namespace Poco::XML { NodeFilter::~NodeFilter() @@ -24,4 +23,4 @@ NodeFilter::~NodeFilter() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/NodeIterator.cpp b/XML/src/NodeIterator.cpp index 497f9224f9..16e1857216 100644 --- a/XML/src/NodeIterator.cpp +++ b/XML/src/NodeIterator.cpp @@ -18,8 +18,7 @@ #include "Poco/DOM/DOMException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { NodeIterator::NodeIterator(Node* root, unsigned long whatToShow, NodeFilter* pFilter): @@ -173,4 +172,4 @@ Node* NodeIterator::last() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/NodeList.cpp b/XML/src/NodeList.cpp index e56b37ce19..d846f6b9fc 100644 --- a/XML/src/NodeList.cpp +++ b/XML/src/NodeList.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/NodeList.h" -namespace Poco { -namespace XML { +namespace Poco::XML { NodeList::~NodeList() @@ -24,4 +23,4 @@ NodeList::~NodeList() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Notation.cpp b/XML/src/Notation.cpp index db0acc48eb..ec882a8f0b 100644 --- a/XML/src/Notation.cpp +++ b/XML/src/Notation.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/Notation.h" -namespace Poco { -namespace XML { +namespace Poco::XML { Notation::Notation(Document* pOwnerDocument, const XMLString& name, const XMLString& publicId, const XMLString& systemId): @@ -60,4 +59,4 @@ Node* Notation::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/ParserEngine.cpp b/XML/src/ParserEngine.cpp index 956a90e0fd..dd7ebe1236 100644 --- a/XML/src/ParserEngine.cpp +++ b/XML/src/ParserEngine.cpp @@ -35,8 +35,7 @@ using Poco::URI; using Poco::TextEncoding; -namespace Poco { -namespace XML { +namespace Poco::XML { class ContextLocator: public Locator @@ -941,4 +940,4 @@ int ParserEngine::convert(void* data, const char* s) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/ParserEngine.h b/XML/src/ParserEngine.h index c710c7c9d0..cb9c15a5e9 100644 --- a/XML/src/ParserEngine.h +++ b/XML/src/ParserEngine.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { class InputSource; @@ -374,7 +373,7 @@ inline bool ParserEngine::getEnablePartialReads() const } -} } // namespace Poco::XML +} // namespace Poco::XML #endif // XML_ParserEngine_INCLUDED diff --git a/XML/src/ProcessingInstruction.cpp b/XML/src/ProcessingInstruction.cpp index 734e39d2cc..74a8b00061 100644 --- a/XML/src/ProcessingInstruction.cpp +++ b/XML/src/ProcessingInstruction.cpp @@ -15,8 +15,7 @@ #include "Poco/DOM/ProcessingInstruction.h" -namespace Poco { -namespace XML { +namespace Poco::XML { ProcessingInstruction::ProcessingInstruction(Document* pOwnerDocument, const XMLString& target, const XMLString& data): @@ -76,4 +75,4 @@ Node* ProcessingInstruction::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/QName.cpp b/XML/src/QName.cpp index 620c041f1d..1261b2e9d4 100644 --- a/XML/src/QName.cpp +++ b/XML/src/QName.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { QName::QName() @@ -111,4 +110,4 @@ std::ostream& operator << (std::ostream& os, const QName& qn) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/SAXException.cpp b/XML/src/SAXException.cpp index 56a7a5def0..d171cd1958 100644 --- a/XML/src/SAXException.cpp +++ b/XML/src/SAXException.cpp @@ -18,8 +18,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { POCO_IMPLEMENT_EXCEPTION(SAXException, XMLException, "SAX Exception") @@ -135,4 +134,4 @@ std::string SAXParseException::buildMessage(const std::string& msg, const XMLStr } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/SAXParser.cpp b/XML/src/SAXParser.cpp index 3217800f2c..c5c99ff019 100644 --- a/XML/src/SAXParser.cpp +++ b/XML/src/SAXParser.cpp @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString SAXParser::FEATURE_PARTIAL_READS = toXMLString("http://www.appinf.com/features/enable-partial-reads"); @@ -245,4 +244,4 @@ void SAXParser::setupParse() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/Text.cpp b/XML/src/Text.cpp index f6bb62b909..57b2402aa7 100644 --- a/XML/src/Text.cpp +++ b/XML/src/Text.cpp @@ -17,8 +17,7 @@ #include "Poco/DOM/DOMException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString Text::NODE_NAME = toXMLString("#text"); @@ -77,4 +76,4 @@ Node* Text::copyNode(bool deep, Document* pOwnerDocument) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/TreeWalker.cpp b/XML/src/TreeWalker.cpp index 10dd859fa2..8f79c159ac 100644 --- a/XML/src/TreeWalker.cpp +++ b/XML/src/TreeWalker.cpp @@ -17,8 +17,7 @@ #include "Poco/DOM/NodeFilter.h" -namespace Poco { -namespace XML { +namespace Poco::XML { TreeWalker::TreeWalker(Node* root, unsigned long whatToShow, NodeFilter* pFilter): @@ -224,4 +223,4 @@ Node* TreeWalker::previous(Node* pNode) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/ValueTraits.cpp b/XML/src/ValueTraits.cpp index c9b5b3efb8..4c86151364 100644 --- a/XML/src/ValueTraits.cpp +++ b/XML/src/ValueTraits.cpp @@ -21,8 +21,7 @@ #include "Poco/XML/XMLStreamParserException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { bool DefaultValueTraits::parse(std::string s, const XMLStreamParser& p) @@ -36,4 +35,4 @@ bool DefaultValueTraits::parse(std::string s, const XMLStreamParser& p) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/WhitespaceFilter.cpp b/XML/src/WhitespaceFilter.cpp index 51f9535b2d..d4f946b460 100644 --- a/XML/src/WhitespaceFilter.cpp +++ b/XML/src/WhitespaceFilter.cpp @@ -16,8 +16,7 @@ #include "Poco/SAX/SAXException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { WhitespaceFilter::WhitespaceFilter(): @@ -209,4 +208,4 @@ void WhitespaceFilter::setupParse() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/XMLException.cpp b/XML/src/XMLException.cpp index 62ba990cda..0fb89ef21a 100644 --- a/XML/src/XMLException.cpp +++ b/XML/src/XMLException.cpp @@ -19,11 +19,10 @@ using Poco::RuntimeException; -namespace Poco { -namespace XML { +namespace Poco::XML { POCO_IMPLEMENT_EXCEPTION(XMLException, RuntimeException, "XML Exception") -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/XMLFilter.cpp b/XML/src/XMLFilter.cpp index a409db1e8b..92b610111e 100644 --- a/XML/src/XMLFilter.cpp +++ b/XML/src/XMLFilter.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/XMLFilter.h" -namespace Poco { -namespace XML { +namespace Poco::XML { XMLFilter::~XMLFilter() @@ -24,4 +23,4 @@ XMLFilter::~XMLFilter() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/XMLFilterImpl.cpp b/XML/src/XMLFilterImpl.cpp index 1e5d73b5a1..deec18494e 100644 --- a/XML/src/XMLFilterImpl.cpp +++ b/XML/src/XMLFilterImpl.cpp @@ -16,8 +16,7 @@ #include "Poco/SAX/SAXException.h" -namespace Poco { -namespace XML { +namespace Poco::XML { XMLFilterImpl::XMLFilterImpl(): @@ -310,4 +309,4 @@ void XMLFilterImpl::setupParse() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/XMLReader.cpp b/XML/src/XMLReader.cpp index d6cd767d7d..f825dc8211 100644 --- a/XML/src/XMLReader.cpp +++ b/XML/src/XMLReader.cpp @@ -15,8 +15,7 @@ #include "Poco/SAX/XMLReader.h" -namespace Poco { -namespace XML { +namespace Poco::XML { const XMLString XMLReader::FEATURE_VALIDATION = toXMLString("http://xml.org/sax/features/validation"); @@ -34,4 +33,4 @@ XMLReader::~XMLReader() } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/XMLStreamParser.cpp b/XML/src/XMLStreamParser.cpp index 06c6990a1b..0f1e81ce99 100644 --- a/XML/src/XMLStreamParser.cpp +++ b/XML/src/XMLStreamParser.cpp @@ -24,8 +24,7 @@ #include -namespace Poco { -namespace XML { +namespace Poco::XML { struct StreamExceptionController @@ -937,4 +936,4 @@ void XMLStreamParser::handleEndNamespaceDecl(void* v, const XMLChar* prefix) } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/XMLStreamParserException.cpp b/XML/src/XMLStreamParserException.cpp index d7b01690ed..be7827c95b 100644 --- a/XML/src/XMLStreamParserException.cpp +++ b/XML/src/XMLStreamParserException.cpp @@ -16,8 +16,7 @@ #include "Poco/XML/XMLStreamParser.h" -namespace Poco { -namespace XML { +namespace Poco::XML { XMLStreamParserException::~XMLStreamParserException() noexcept @@ -85,4 +84,4 @@ char const* XMLStreamParserException::what() const noexcept } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/XMLString.cpp b/XML/src/XMLString.cpp index 8e9e322fa5..9432a4a164 100644 --- a/XML/src/XMLString.cpp +++ b/XML/src/XMLString.cpp @@ -20,8 +20,7 @@ #endif -namespace Poco { -namespace XML { +namespace Poco::XML { #if defined(XML_UNICODE_WCHAR_T) @@ -61,4 +60,4 @@ XMLString toXMLString(const std::string& str) #endif // XML_UNICODE_WCHAR_T -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/XML/src/XMLWriter.cpp b/XML/src/XMLWriter.cpp index 2dcd275452..895219edc1 100644 --- a/XML/src/XMLWriter.cpp +++ b/XML/src/XMLWriter.cpp @@ -24,8 +24,7 @@ using namespace std::string_literals; -namespace Poco { -namespace XML { +namespace Poco::XML { const std::string XMLWriter::NEWLINE_DEFAULT; @@ -1067,4 +1066,4 @@ bool XMLWriter::isNamespaceMapped(const XMLString& namespc) const } -} } // namespace Poco::XML +} // namespace Poco::XML diff --git a/Zip/include/Poco/Zip/Add.h b/Zip/include/Poco/Zip/Add.h index 016a57c13c..7cbe431d12 100644 --- a/Zip/include/Poco/Zip/Add.h +++ b/Zip/include/Poco/Zip/Add.h @@ -23,8 +23,7 @@ #include "Poco/Zip/ZipCommon.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API Add: public ZipOperation @@ -45,7 +44,7 @@ class Zip_API Add: public ZipOperation }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_Add_INCLUDED diff --git a/Zip/include/Poco/Zip/AutoDetectStream.h b/Zip/include/Poco/Zip/AutoDetectStream.h index 6ad716ecac..44e1ae93e1 100644 --- a/Zip/include/Poco/Zip/AutoDetectStream.h +++ b/Zip/include/Poco/Zip/AutoDetectStream.h @@ -23,8 +23,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API AutoDetectStreamBuf: public Poco::BufferedStreamBuf @@ -95,7 +94,7 @@ class Zip_API AutoDetectInputStream: public AutoDetectIOS, public std::istream }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_AutoDetectStream_INCLUDED diff --git a/Zip/include/Poco/Zip/Compress.h b/Zip/include/Poco/Zip/Compress.h index d3c90c8696..241ee29143 100644 --- a/Zip/include/Poco/Zip/Compress.h +++ b/Zip/include/Poco/Zip/Compress.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API Compress @@ -145,7 +144,7 @@ inline const std::set& Compress::getStoreExtensions() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_Compress_INCLUDED diff --git a/Zip/include/Poco/Zip/Decompress.h b/Zip/include/Poco/Zip/Decompress.h index 5cf7323b26..d141ec1a91 100644 --- a/Zip/include/Poco/Zip/Decompress.h +++ b/Zip/include/Poco/Zip/Decompress.h @@ -25,8 +25,7 @@ #include "Poco/BasicEvent.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class ZipArchive; @@ -87,7 +86,7 @@ inline const Decompress::ZipMapping& Decompress::mapping() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_Decompress_INCLUDED diff --git a/Zip/include/Poco/Zip/Delete.h b/Zip/include/Poco/Zip/Delete.h index 6672325bca..fb529047cc 100644 --- a/Zip/include/Poco/Zip/Delete.h +++ b/Zip/include/Poco/Zip/Delete.h @@ -23,8 +23,7 @@ #include "Poco/Zip/ZipLocalFileHeader.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API Delete: public ZipOperation @@ -42,7 +41,7 @@ class Zip_API Delete: public ZipOperation }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_Delete_INCLUDED diff --git a/Zip/include/Poco/Zip/Keep.h b/Zip/include/Poco/Zip/Keep.h index c20108e491..0f1e6591c8 100644 --- a/Zip/include/Poco/Zip/Keep.h +++ b/Zip/include/Poco/Zip/Keep.h @@ -23,8 +23,7 @@ #include "Poco/Zip/ZipLocalFileHeader.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API Keep: public ZipOperation @@ -43,7 +42,7 @@ class Zip_API Keep: public ZipOperation }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_Keep_INCLUDED diff --git a/Zip/include/Poco/Zip/ParseCallback.h b/Zip/include/Poco/Zip/ParseCallback.h index c566d79cb3..f148f69f65 100644 --- a/Zip/include/Poco/Zip/ParseCallback.h +++ b/Zip/include/Poco/Zip/ParseCallback.h @@ -22,8 +22,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class ZipLocalFileHeader; @@ -48,7 +47,7 @@ class Zip_API ParseCallback }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ParseCallback_INCLUDED diff --git a/Zip/include/Poco/Zip/PartialStream.h b/Zip/include/Poco/Zip/PartialStream.h index b611b4c6fa..a2febc5e22 100644 --- a/Zip/include/Poco/Zip/PartialStream.h +++ b/Zip/include/Poco/Zip/PartialStream.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API PartialStreamBuf: public Poco::BufferedStreamBuf @@ -181,7 +180,7 @@ inline Poco::UInt64 PartialOutputStream::bytesWritten() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_PartialStream_INCLUDED diff --git a/Zip/include/Poco/Zip/Rename.h b/Zip/include/Poco/Zip/Rename.h index 487dc1958e..1321aa18d8 100644 --- a/Zip/include/Poco/Zip/Rename.h +++ b/Zip/include/Poco/Zip/Rename.h @@ -23,8 +23,7 @@ #include "Poco/Zip/ZipLocalFileHeader.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API Rename: public ZipOperation @@ -43,7 +42,7 @@ class Zip_API Rename: public ZipOperation }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_Rename_INCLUDED diff --git a/Zip/include/Poco/Zip/Replace.h b/Zip/include/Poco/Zip/Replace.h index 6ca558db96..0acfb91e65 100644 --- a/Zip/include/Poco/Zip/Replace.h +++ b/Zip/include/Poco/Zip/Replace.h @@ -24,8 +24,7 @@ #include "Poco/Zip/ZipOperation.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API Replace: public ZipOperation @@ -44,7 +43,7 @@ class Zip_API Replace: public ZipOperation }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_Replace_INCLUDED diff --git a/Zip/include/Poco/Zip/SkipCallback.h b/Zip/include/Poco/Zip/SkipCallback.h index c4d63b0d4f..e92e68094b 100644 --- a/Zip/include/Poco/Zip/SkipCallback.h +++ b/Zip/include/Poco/Zip/SkipCallback.h @@ -22,8 +22,7 @@ #include "Poco/Zip/ParseCallback.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API SkipCallback: public ParseCallback @@ -40,7 +39,7 @@ class Zip_API SkipCallback: public ParseCallback }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_SkipCallback_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipArchive.h b/Zip/include/Poco/Zip/ZipArchive.h index 8c194ca6a7..ef9dad10a0 100644 --- a/Zip/include/Poco/Zip/ZipArchive.h +++ b/Zip/include/Poco/Zip/ZipArchive.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class ParseCallback; @@ -118,7 +117,7 @@ inline ZipArchive::FileHeaders::const_iterator ZipArchive::headerEnd() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipArchive_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipArchiveInfo.h b/Zip/include/Poco/Zip/ZipArchiveInfo.h index 32971a9313..3de226c5f8 100644 --- a/Zip/include/Poco/Zip/ZipArchiveInfo.h +++ b/Zip/include/Poco/Zip/ZipArchiveInfo.h @@ -23,8 +23,7 @@ #include "Poco/Zip/ZipUtil.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API ZipArchiveInfo @@ -408,7 +407,7 @@ inline void ZipArchiveInfo64::setTotalNumberOfDisks(Poco::UInt32 val) } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipArchiveInfo_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipCommon.h b/Zip/include/Poco/Zip/ZipCommon.h index 336d598c79..018fc40202 100644 --- a/Zip/include/Poco/Zip/ZipCommon.h +++ b/Zip/include/Poco/Zip/ZipCommon.h @@ -21,8 +21,7 @@ #include "Poco/Zip/Zip.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API ZipCommon @@ -114,7 +113,7 @@ class Zip_API ZipCommon }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipCommon_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipDataInfo.h b/Zip/include/Poco/Zip/ZipDataInfo.h index 7767480e0b..704ffe4b2c 100644 --- a/Zip/include/Poco/Zip/ZipDataInfo.h +++ b/Zip/include/Poco/Zip/ZipDataInfo.h @@ -23,8 +23,7 @@ #include "Poco/Zip/ZipUtil.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API ZipDataInfo @@ -242,7 +241,7 @@ inline Poco::UInt32 ZipDataInfo64::getFullHeaderSize() } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipDataInfo_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipException.h b/Zip/include/Poco/Zip/ZipException.h index 435c496f24..7e41d3a036 100644 --- a/Zip/include/Poco/Zip/ZipException.h +++ b/Zip/include/Poco/Zip/ZipException.h @@ -22,15 +22,14 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { POCO_DECLARE_EXCEPTION(Zip_API, ZipException, Poco::RuntimeException) POCO_DECLARE_EXCEPTION(Zip_API, ZipManipulationException, ZipException) -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipException_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipFileInfo.h b/Zip/include/Poco/Zip/ZipFileInfo.h index dc5f532fb8..ae46e533e9 100644 --- a/Zip/include/Poco/Zip/ZipFileInfo.h +++ b/Zip/include/Poco/Zip/ZipFileInfo.h @@ -22,8 +22,7 @@ #include "Poco/Zip/ZipCommon.h" #include "Poco/Zip/ZipUtil.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { class ZipLocalFileHeader; @@ -512,7 +511,7 @@ inline void ZipFileInfo::setExternalFileAttributes(Poco::UInt32 attrs) } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipFileInfo_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipLocalFileHeader.h b/Zip/include/Poco/Zip/ZipLocalFileHeader.h index 5005cb1a0b..57fb991036 100644 --- a/Zip/include/Poco/Zip/ZipLocalFileHeader.h +++ b/Zip/include/Poco/Zip/ZipLocalFileHeader.h @@ -26,8 +26,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class ParseCallback; @@ -507,7 +506,7 @@ inline std::streamoff ZipLocalFileHeader::getDataEndPos() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipLocalFileHeader_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipManipulator.h b/Zip/include/Poco/Zip/ZipManipulator.h index 0077e50bc7..fb68c0d240 100644 --- a/Zip/include/Poco/Zip/ZipManipulator.h +++ b/Zip/include/Poco/Zip/ZipManipulator.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class ZipArchive; @@ -103,7 +102,7 @@ inline const ZipArchive& ZipManipulator::originalArchive() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipManipulator_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipOperation.h b/Zip/include/Poco/Zip/ZipOperation.h index 2f0ea32ea7..69f30d6244 100644 --- a/Zip/include/Poco/Zip/ZipOperation.h +++ b/Zip/include/Poco/Zip/ZipOperation.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Compress; @@ -50,7 +49,7 @@ class Zip_API ZipOperation: public Poco::RefCountedObject }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipOperation_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipStream.h b/Zip/include/Poco/Zip/ZipStream.h index 1aa2c50991..cb3c0ea408 100644 --- a/Zip/include/Poco/Zip/ZipStream.h +++ b/Zip/include/Poco/Zip/ZipStream.h @@ -27,8 +27,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class ZipArchive; @@ -144,7 +143,7 @@ class Zip_API ZipOutputStream: public ZipIOS, public std::ostream }; -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipStream_INCLUDED diff --git a/Zip/include/Poco/Zip/ZipUtil.h b/Zip/include/Poco/Zip/ZipUtil.h index a114405090..fe1e510270 100644 --- a/Zip/include/Poco/Zip/ZipUtil.h +++ b/Zip/include/Poco/Zip/ZipUtil.h @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { class Zip_API ZipUtil @@ -120,7 +119,7 @@ inline void ZipUtil::set64BitValue(const Poco::UInt64 val, char* pVal, const Poc } -} } // namespace Poco::Zip +} // namespace Poco::Zip #endif // Zip_ZipUtil_INCLUDED diff --git a/Zip/src/Add.cpp b/Zip/src/Add.cpp index a44e1ed092..a88809ea96 100644 --- a/Zip/src/Add.cpp +++ b/Zip/src/Add.cpp @@ -16,8 +16,7 @@ #include "Poco/Zip/Compress.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { Add::Add(const std::string& zipPath, const std::string& localPath, ZipCommon::CompressionMethod cm, ZipCommon::CompressionLevel cl): @@ -35,4 +34,4 @@ void Add::execute(Compress& c, std::istream& input) } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/AutoDetectStream.cpp b/Zip/src/AutoDetectStream.cpp index 8aed0db596..d6ec9c4324 100644 --- a/Zip/src/AutoDetectStream.cpp +++ b/Zip/src/AutoDetectStream.cpp @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { AutoDetectStreamBuf::AutoDetectStreamBuf(std::istream& in, const std::string& pre, const std::string& post, bool reposition, Poco::UInt32 start, bool needsZip64): @@ -226,4 +225,4 @@ AutoDetectInputStream::~AutoDetectInputStream() } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/Compress.cpp b/Zip/src/Compress.cpp index 21dcd3e55f..827933a19e 100644 --- a/Zip/src/Compress.cpp +++ b/Zip/src/Compress.cpp @@ -24,8 +24,7 @@ #include "Poco/String.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { Compress::Compress(std::ostream& out, bool seekableOut, bool forceZip64): @@ -392,4 +391,4 @@ void Compress::setStoreExtensions(const std::set& extensions) } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/Decompress.cpp b/Zip/src/Decompress.cpp index 7075516e16..eb1c8e30d9 100644 --- a/Zip/src/Decompress.cpp +++ b/Zip/src/Decompress.cpp @@ -25,8 +25,7 @@ #include "Poco/Format.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { Decompress::Decompress(std::istream& in, const Poco::Path& outputDir, bool flattenDirs, bool keepIncompleteFiles): @@ -188,4 +187,4 @@ void Decompress::onOk(const void*, std::pair -namespace Poco { -namespace Zip { +namespace Poco::Zip { PartialStreamBuf::PartialStreamBuf(std::istream& in, std::ios::pos_type start, std::ios::pos_type endPos, const std::string& pre, const std::string& post, bool initStream): @@ -252,4 +251,4 @@ PartialOutputStream::~PartialOutputStream() } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/Rename.cpp b/Zip/src/Rename.cpp index 7ac914453d..012fcad976 100644 --- a/Zip/src/Rename.cpp +++ b/Zip/src/Rename.cpp @@ -16,8 +16,7 @@ #include "Poco/Zip/Compress.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { Rename::Rename(const ZipLocalFileHeader& hdr, const std::string& newZipEntryName): @@ -33,4 +32,4 @@ void Rename::execute(Compress& c, std::istream& input) } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/Replace.cpp b/Zip/src/Replace.cpp index 3359c8ee71..5336465e9f 100644 --- a/Zip/src/Replace.cpp +++ b/Zip/src/Replace.cpp @@ -16,8 +16,7 @@ #include "Poco/Zip/Compress.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { Replace::Replace(const ZipLocalFileHeader& hdr, const std::string& localPath): @@ -34,4 +33,4 @@ void Replace::execute(Compress& c, std::istream& input) } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/SkipCallback.cpp b/Zip/src/SkipCallback.cpp index 6755a9db65..edf96ecb83 100644 --- a/Zip/src/SkipCallback.cpp +++ b/Zip/src/SkipCallback.cpp @@ -18,8 +18,7 @@ #include "Poco/Exception.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { SkipCallback::SkipCallback() @@ -43,4 +42,4 @@ bool SkipCallback::handleZipEntry(std::istream& zipStream, const ZipLocalFileHea } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipArchive.cpp b/Zip/src/ZipArchive.cpp index 47454901e3..7a60abbba3 100644 --- a/Zip/src/ZipArchive.cpp +++ b/Zip/src/ZipArchive.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { const std::string ZipArchive::EMPTY_COMMENT; @@ -180,4 +179,4 @@ const std::string& ZipArchive::getZipComment() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipArchiveInfo.cpp b/Zip/src/ZipArchiveInfo.cpp index 6369274fb4..f891a8e959 100644 --- a/Zip/src/ZipArchiveInfo.cpp +++ b/Zip/src/ZipArchiveInfo.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { const char ZipArchiveInfo::HEADER[ZipCommon::HEADER_SIZE] = {'\x50', '\x4b', '\x05', '\x06'}; @@ -187,4 +186,4 @@ std::string ZipArchiveInfo64::createHeader() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipCommon.cpp b/Zip/src/ZipCommon.cpp index ecac0ce6dd..2aa21c245e 100644 --- a/Zip/src/ZipCommon.cpp +++ b/Zip/src/ZipCommon.cpp @@ -16,8 +16,7 @@ #include "Poco/Path.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { bool ZipCommon::isValidPath(const std::string& path) @@ -53,4 +52,4 @@ bool ZipCommon::isValidPath(const std::string& path) } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipDataInfo.cpp b/Zip/src/ZipDataInfo.cpp index ddd4f08d08..3369cf6c4e 100644 --- a/Zip/src/ZipDataInfo.cpp +++ b/Zip/src/ZipDataInfo.cpp @@ -18,8 +18,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { const char ZipDataInfo::HEADER[ZipCommon::HEADER_SIZE] = {'\x50', '\x4b', '\x07', '\x08'}; @@ -103,4 +102,4 @@ ZipDataInfo64::~ZipDataInfo64() } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipException.cpp b/Zip/src/ZipException.cpp index fbe590a6cd..1d1683e084 100644 --- a/Zip/src/ZipException.cpp +++ b/Zip/src/ZipException.cpp @@ -16,12 +16,11 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { POCO_IMPLEMENT_EXCEPTION(ZipException, Poco::RuntimeException, "ZIP Exception") POCO_IMPLEMENT_EXCEPTION(ZipManipulationException, ZipException, "ZIP Manipulation Exception") -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipFileInfo.cpp b/Zip/src/ZipFileInfo.cpp index 3fa35733a0..a4b46a71c8 100644 --- a/Zip/src/ZipFileInfo.cpp +++ b/Zip/src/ZipFileInfo.cpp @@ -19,8 +19,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { const char ZipFileInfo::HEADER[ZipCommon::HEADER_SIZE] = {'\x50', '\x4b', '\x01', '\x02'}; @@ -185,4 +184,4 @@ void ZipFileInfo::setUnixAttributes() } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipLocalFileHeader.cpp b/Zip/src/ZipLocalFileHeader.cpp index f5294b8aad..166cce2aef 100644 --- a/Zip/src/ZipLocalFileHeader.cpp +++ b/Zip/src/ZipLocalFileHeader.cpp @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { const char ZipLocalFileHeader::HEADER[ZipCommon::HEADER_SIZE] = {'\x50', '\x4b', '\x03', '\x04'}; @@ -259,4 +258,4 @@ std::string ZipLocalFileHeader::createHeader() const } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipManipulator.cpp b/Zip/src/ZipManipulator.cpp index 20e2583bc4..24f99bd1b6 100644 --- a/Zip/src/ZipManipulator.cpp +++ b/Zip/src/ZipManipulator.cpp @@ -26,8 +26,7 @@ #include "Poco/FileStream.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { ZipManipulator::ZipManipulator(const std::string& zipFile, bool backupOriginalFile): @@ -168,4 +167,4 @@ ZipArchive ZipManipulator::compress(const std::string& outFile) } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipOperation.cpp b/Zip/src/ZipOperation.cpp index e0c5a13af0..4feb57f64e 100644 --- a/Zip/src/ZipOperation.cpp +++ b/Zip/src/ZipOperation.cpp @@ -15,8 +15,7 @@ #include "Poco/Zip/ZipOperation.h" -namespace Poco { -namespace Zip { +namespace Poco::Zip { ZipOperation::ZipOperation() @@ -29,4 +28,4 @@ ZipOperation::~ZipOperation() } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipStream.cpp b/Zip/src/ZipStream.cpp index 19d8609acd..0fbc50f176 100644 --- a/Zip/src/ZipStream.cpp +++ b/Zip/src/ZipStream.cpp @@ -25,8 +25,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { ZipStreamBuf::ZipStreamBuf(std::istream& istr, const ZipLocalFileHeader& fileEntry, bool reposition): @@ -330,4 +329,4 @@ void ZipOutputStream::close(Poco::UInt64& extraDataSize) } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/Zip/src/ZipUtil.cpp b/Zip/src/ZipUtil.cpp index d357a721d8..4a7645e88f 100644 --- a/Zip/src/ZipUtil.cpp +++ b/Zip/src/ZipUtil.cpp @@ -21,8 +21,7 @@ #include -namespace Poco { -namespace Zip { +namespace Poco::Zip { Poco::DateTime ZipUtil::parseDateTime(const char* pVal, const Poco::UInt32 timePos, const Poco::UInt32 datePos) @@ -246,4 +245,4 @@ std::string ZipUtil::validZipEntryFileName(const Poco::Path& entry) } -} } // namespace Poco::Zip +} // namespace Poco::Zip diff --git a/dependencies/cpptrace/src/symbols/dwarf/debug_map_resolver.cpp b/dependencies/cpptrace/src/symbols/dwarf/debug_map_resolver.cpp index 9b63691af6..631c67e024 100644 --- a/dependencies/cpptrace/src/symbols/dwarf/debug_map_resolver.cpp +++ b/dependencies/cpptrace/src/symbols/dwarf/debug_map_resolver.cpp @@ -19,8 +19,7 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail { -namespace libdwarf { +namespace detail::libdwarf { #if IS_APPLE struct target_object { std::string object_path; @@ -201,8 +200,7 @@ namespace libdwarf { return detail::make_unique(object_path); } #endif -} -} +} // namespace detail::libdwarf CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/dwarf/dwarf_resolver.cpp b/dependencies/cpptrace/src/symbols/dwarf/dwarf_resolver.cpp index 909614180c..8c7983f0a4 100644 --- a/dependencies/cpptrace/src/symbols/dwarf/dwarf_resolver.cpp +++ b/dependencies/cpptrace/src/symbols/dwarf/dwarf_resolver.cpp @@ -36,8 +36,7 @@ // https://github.com/ruby/ruby/blob/master/addr2line.c CPPTRACE_BEGIN_NAMESPACE -namespace detail { -namespace libdwarf { +namespace detail::libdwarf { // printbugging as we go constexpr bool dump_dwarf = false; constexpr bool trace_dwarf = false; @@ -1023,8 +1022,7 @@ namespace libdwarf { std::unique_ptr make_dwarf_resolver(cstring_view object_path) { return detail::make_unique(object_path); } -} -} +} // namespace detail::libdwarf CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_addr2line.cpp b/dependencies/cpptrace/src/symbols/symbols_with_addr2line.cpp index d31ca86cba..fa7463ad42 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_addr2line.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_addr2line.cpp @@ -25,8 +25,7 @@ #include "options.hpp" CPPTRACE_BEGIN_NAMESPACE -namespace detail { -namespace addr2line { +namespace detail::addr2line { #if IS_LINUX || IS_APPLE bool has_addr2line() { static std::mutex mutex; @@ -321,8 +320,7 @@ namespace addr2line { } return trace; } -} -} +} // namespace detail::addr2line CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_dbghelp.cpp b/dependencies/cpptrace/src/symbols/symbols_with_dbghelp.cpp index 559ea462f0..b72e8d1704 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_dbghelp.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_dbghelp.cpp @@ -23,8 +23,7 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail { -namespace dbghelp { +namespace detail::dbghelp { // SymFromAddr only returns the function's name. In order to get information about parameters, // important for C++ stack traces where functions may be overloaded, we have to manually use // Windows DIA to walk debug info structures. Resources: @@ -446,8 +445,7 @@ namespace dbghelp { } return trace; } -} -} +} // namespace detail::dbghelp CPPTRACE_END_NAMESPACE CPPTRACE_BEGIN_NAMESPACE diff --git a/dependencies/cpptrace/src/symbols/symbols_with_dl.cpp b/dependencies/cpptrace/src/symbols/symbols_with_dl.cpp index 7887d5108c..493e8b2904 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_dl.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_dl.cpp @@ -11,8 +11,7 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail { -namespace libdl { +namespace detail::libdl { stacktrace_frame resolve_frame(const frame_ptr addr) { Dl_info info; if(dladdr(reinterpret_cast(addr), &info)) { // thread-safe @@ -49,8 +48,7 @@ namespace libdl { } return trace; } -} -} +} // namespace detail::libdl CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_libbacktrace.cpp b/dependencies/cpptrace/src/symbols/symbols_with_libbacktrace.cpp index 5233654f8d..517ac378d9 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_libbacktrace.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_libbacktrace.cpp @@ -21,8 +21,7 @@ #endif CPPTRACE_BEGIN_NAMESPACE -namespace detail { -namespace libbacktrace { +namespace detail::libbacktrace { int full_callback(void* data, std::uintptr_t address, const char* file, int line, const char* symbol) { stacktrace_frame& frame = *static_cast(data); frame.raw_address = address; @@ -100,8 +99,7 @@ namespace libbacktrace { } return trace; } -} -} +} // namespace detail::libbacktrace CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_libdwarf.cpp b/dependencies/cpptrace/src/symbols/symbols_with_libdwarf.cpp index 5f8334532b..b5cd6440fd 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_libdwarf.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_libdwarf.cpp @@ -19,8 +19,7 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail { -namespace libdwarf { +namespace detail::libdwarf { std::unique_ptr get_resolver_for_object(const std::string& object_path) { #if IS_APPLE // Check if dSYM exist, if not fallback to debug map @@ -177,8 +176,7 @@ namespace libdwarf { // flatten and finish return flatten_inlines(trace); } -} -} +} // namespace detail::libdwarf CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_nothing.cpp b/dependencies/cpptrace/src/symbols/symbols_with_nothing.cpp index 571e1e76af..7249d5cce7 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_nothing.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_nothing.cpp @@ -7,8 +7,7 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail { -namespace nothing { +namespace detail::nothing { std::vector resolve_frames(const std::vector& frames) { return std::vector(frames.size(), null_frame()); } @@ -16,8 +15,7 @@ namespace nothing { std::vector resolve_frames(const std::vector& frames) { return std::vector(frames.size(), null_frame()); } -} -} +} // namespace detail::nothing CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/utils/microfmt.cpp b/dependencies/cpptrace/src/utils/microfmt.cpp index 0f533dc549..41611089d6 100644 --- a/dependencies/cpptrace/src/utils/microfmt.cpp +++ b/dependencies/cpptrace/src/utils/microfmt.cpp @@ -3,13 +3,11 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace microfmt { -namespace detail { +namespace microfmt::detail { std::ostream& get_cout() { return std::cout; } -} -} +} // namespace microfmt::detail CPPTRACE_END_NAMESPACE diff --git a/dependencies/tessil/include/Poco/ordered_hash.h b/dependencies/tessil/include/Poco/ordered_hash.h index 614ec94386..87e800f192 100644 --- a/dependencies/tessil/include/Poco/ordered_hash.h +++ b/dependencies/tessil/include/Poco/ordered_hash.h @@ -83,9 +83,7 @@ #endif #endif -namespace tsl { - -namespace detail_ordered_hash { +namespace tsl::detail_ordered_hash { template struct make_void { @@ -1694,8 +1692,6 @@ class ordered_hash : private Hash, private KeyEqual { bool m_grow_on_next_insert; }; -} // end namespace detail_ordered_hash - -} // end namespace tsl +} // namespace tsl::detail_ordered_hash #endif diff --git a/dependencies/v8_double_conversion/src/cached-powers.h b/dependencies/v8_double_conversion/src/cached-powers.h index f38c26d201..1da76c1566 100644 --- a/dependencies/v8_double_conversion/src/cached-powers.h +++ b/dependencies/v8_double_conversion/src/cached-powers.h @@ -30,9 +30,7 @@ #include "diy-fp.h" -namespace double_conversion { - -namespace PowersOfTenCache { +namespace double_conversion::PowersOfTenCache { // Not all powers of ten are cached. The decimal exponent of two neighboring // cached numbers will differ by kDecimalExponentDistance. @@ -57,8 +55,6 @@ namespace PowersOfTenCache { DiyFp* power, int* found_exponent); -} // namespace PowersOfTenCache - -} // namespace double_conversion +} // namespace double_conversion::PowersOfTenCache #endif // DOUBLE_CONVERSION_CACHED_POWERS_H_ From 3ba6402f9182f10c1dfef11a12733f45156a6ae6 Mon Sep 17 00:00:00 2001 From: Toyosatomimi no Miko <110693261+mikomikotaishi@users.noreply.github.com> Date: Thu, 12 Mar 2026 00:52:24 -0400 Subject: [PATCH 2/6] Add inline namespace parsing to CppParser --- CppParser/include/Poco/CppParser/NameSpace.h | 17 +++- CppParser/src/NameSpace.cpp | 12 ++- CppParser/src/Parser.cpp | 69 +++++++++++++--- CppParser/testsuite/src/CppParserTest.cpp | 83 ++++++++++++++++++++ CppParser/testsuite/src/CppParserTest.h | 2 + 5 files changed, 172 insertions(+), 11 deletions(-) diff --git a/CppParser/include/Poco/CppParser/NameSpace.h b/CppParser/include/Poco/CppParser/NameSpace.h index a843c3ed9e..e42fa9e2bd 100644 --- a/CppParser/include/Poco/CppParser/NameSpace.h +++ b/CppParser/include/Poco/CppParser/NameSpace.h @@ -40,7 +40,7 @@ class CppParser_API NameSpace: public Symbol NameSpace(); /// Creates the NameSpace. - NameSpace(const std::string& name, NameSpace* pNameSpace = nullptr); + NameSpace(const std::string& name, NameSpace* pNameSpace = nullptr, bool isInline = false); /// Creates the NameSpace. ~NameSpace(); @@ -98,6 +98,14 @@ class CppParser_API NameSpace: public Symbol const NameSpaceVec& importedNameSpaces() const; /// Returns a vector containing all imported namespaces. + [[nodiscard]] + bool isInline() const; + /// Returns true if this is an inline namespace. + + void setInline(bool isInline); + /// Sets the inline flag for this namespace. + + [[nodiscard]] Symbol::Kind kind() const; std::string toString() const; @@ -116,6 +124,7 @@ class CppParser_API NameSpace: public Symbol SymbolTable _symbols; AliasMap _importedSymbols; NameSpaceVec _importedNameSpaces; + bool _isInline; }; @@ -134,6 +143,12 @@ inline const NameSpace::NameSpaceVec& NameSpace::importedNameSpaces() const } +inline bool NameSpace::isInline() const +{ + return _isInline; +} + + } // namespace Poco::CppParser diff --git a/CppParser/src/NameSpace.cpp b/CppParser/src/NameSpace.cpp index 732b11b23e..63dfecf37b 100644 --- a/CppParser/src/NameSpace.cpp +++ b/CppParser/src/NameSpace.cpp @@ -27,12 +27,14 @@ namespace Poco::CppParser { NameSpace::NameSpace() { + _isInline = false; } -NameSpace::NameSpace(const std::string& name, NameSpace* pNameSpace): +NameSpace::NameSpace(const std::string& name, NameSpace* pNameSpace, bool isInline): Symbol(name, pNameSpace) { + _isInline = isInline; } @@ -45,6 +47,12 @@ NameSpace::~NameSpace() } +void NameSpace::setInline(bool isInline) +{ + _isInline = isInline; +} + + void NameSpace::addSymbol(Symbol* pSymbol) { poco_check_ptr (pSymbol); @@ -207,6 +215,8 @@ Symbol::Kind NameSpace::kind() const std::string NameSpace::toString() const { std::ostringstream ostr; + if (_isInline) + ostr << "inline "; ostr << "namespace " << name() << "\n{\n"; for (Iterator it = begin(); it != end(); ++it) { diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp index f77cdd7f74..264daab4e6 100644 --- a/CppParser/src/Parser.cpp +++ b/CppParser/src/Parser.cpp @@ -222,11 +222,40 @@ const Token* Parser::parseNameSpace(const Token* pNext) if (pNext->is(Token::IDENTIFIER_TOKEN)) { _access = Symbol::ACC_PUBLIC; + + std::vector namespaceNames; + std::vector inlineFlags; + + // First namespace name cannot be inline std::string name = pNext->tokenString(); + namespaceNames.push_back(name); + inlineFlags.push_back(false); pNext = next(); + + while (isOperator(pNext, OperatorToken::OP_DBL_COLON)) + { + pNext = next(); + bool isInline = false; + + if (isKeyword(pNext, IdentifierToken::KW_INLINE)) + { + isInline = true; + pNext = next(); + } + + if (!pNext->is(Token::IDENTIFIER_TOKEN)) + { + syntaxError("namespace name after ::"); + } + + namespaceNames.push_back(pNext->tokenString()); + inlineFlags.push_back(isInline); + pNext = next(); + } if (isOperator(pNext, OperatorToken::OP_ASSIGN)) { + // namespace alias: namespace B = A::C; pNext = next(); while (!isOperator(pNext, OperatorToken::OP_SEMICOLON) && !isEOF(pNext)) { @@ -238,14 +267,31 @@ const Token* Parser::parseNameSpace(const Token* pNext) expectOperator(pNext, OperatorToken::OP_OPENBRACE, "{"); - std::string fullName = currentNameSpace()->fullName(); - if (!fullName.empty()) fullName += "::"; - fullName += name; - - NameSpace* pNS = dynamic_cast(currentNameSpace()->lookup(fullName)); - bool undefined = (pNS == nullptr); - if (undefined) pNS = new NameSpace(name, currentNameSpace()); - pushNameSpace(pNS, -1, undefined); + int nestLevel = 0; + for (size_t i = 0; i < namespaceNames.size(); ++i) + { + NameSpace* pNS = dynamic_cast(currentNameSpace()->lookup(namespaceNames[i])); + bool undefined = (pNS == nullptr); + if (undefined) + pNS = new NameSpace(namespaceNames[i], currentNameSpace(), inlineFlags[i]); + else if (inlineFlags[i]) + { + // If the namespace already exists but this declaration marks it as inline, + // update the inline flag + pNS->setInline(inlineFlags[i]); + } + // Only add the first (outermost) namespace to the global symbol table, + // and only if it's not already there + bool addToGST = false; + if (i == 0) + { + // Check if this namespace is already in the global symbol table + addToGST = (_gst.find(namespaceNames[i]) == _gst.end()); + } + pushNameSpace(pNS, -1, addToGST); + nestLevel++; + } + pNext = next(); while (pNext->is(Token::IDENTIFIER_TOKEN) || pNext->is(Token::KEYWORD_TOKEN)) { @@ -280,6 +326,12 @@ const Token* Parser::parseNameSpace(const Token* pNext) } expectOperator(pNext, OperatorToken::OP_CLOSBRACE, "}"); pNext = next(); + + // Pop all nested namespaces + for (int i = 0; i < nestLevel; ++i) + { + popNameSpace(); + } } else if (isOperator(pNext, OperatorToken::OP_OPENBRACE)) { @@ -289,7 +341,6 @@ const Token* Parser::parseNameSpace(const Token* pNext) return pNext; } else syntaxError("namespace name"); - popNameSpace(); return pNext; } diff --git a/CppParser/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp index 7aff20cfd6..119eb7ff79 100644 --- a/CppParser/testsuite/src/CppParserTest.cpp +++ b/CppParser/testsuite/src/CppParserTest.cpp @@ -417,6 +417,87 @@ class Foo } +void CppParserTest::testParseNestedNamespace() +{ + NameSpace::SymbolTable st; + parseString(R"( +namespace A::B::C +{ + class Foo + { + public: + void bar(); + }; +} +)", st); + + // Check that namespace A exists + assertTrue (st.find("A") != st.end()); + Symbol* pSymA = st.find("A")->second; + NameSpace* pNSA = dynamic_cast(pSymA); + assertTrue (pNSA != nullptr); + + // Check that namespace B exists within A + Symbol* pSymB = pNSA->lookup("B"); + assertTrue (pSymB != nullptr); + NameSpace* pNSB = dynamic_cast(pSymB); + assertTrue (pNSB != nullptr); + + // Check that namespace C exists within B + Symbol* pSymC = pNSB->lookup("C"); + assertTrue (pSymC != nullptr); + NameSpace* pNSC = dynamic_cast(pSymC); + assertTrue (pNSC != nullptr); + + // Check that class Foo exists within C + Symbol* pSymFoo = pNSC->lookup("Foo"); + assertTrue (pSymFoo != nullptr); + Struct* pFoo = dynamic_cast(pSymFoo); + assertTrue (pFoo != nullptr); + + // Check the full name + assertTrue (pFoo->fullName() == "A::B::C::Foo"); +} + + +void CppParserTest::testParseInlineNestedNamespace() +{ + NameSpace::SymbolTable st; + parseString(R"( +namespace A::inline B::C +{ + void func(); +} +)", st); + + // Check that namespace A exists + assertTrue (st.find("A") != st.end()); + Symbol* pSymA = st.find("A")->second; + NameSpace* pNSA = dynamic_cast(pSymA); + assertTrue (pNSA != nullptr); + assertTrue (!pNSA->isInline()); + + // Check that namespace B exists within A and is inline + Symbol* pSymB = pNSA->lookup("B"); + assertTrue (pSymB != nullptr); + NameSpace* pNSB = dynamic_cast(pSymB); + assertTrue (pNSB != nullptr); + assertTrue (pNSB->isInline()); + + // Check that namespace C exists within B and is not inline + Symbol* pSymC = pNSB->lookup("C"); + assertTrue (pSymC != nullptr); + NameSpace* pNSC = dynamic_cast(pSymC); + assertTrue (pNSC != nullptr); + assertTrue (!pNSC->isInline()); + + // Check that func exists within C + Symbol* pSymFunc = pNSC->lookup("func"); + assertTrue (pSymFunc != nullptr); + assertTrue (pSymFunc->fullName() == "A::B::C::func"); +} + + void CppParserTest::setUp() { } @@ -442,6 +523,8 @@ CppUnit::Test* CppParserTest::suite() CppUnit_addTest(pSuite, CppParserTest, testParseDeleteDefault); CppUnit_addTest(pSuite, CppParserTest, testParseAnonymousNamespace); CppUnit_addTest(pSuite, CppParserTest, testParseFriendInline); + CppUnit_addTest(pSuite, CppParserTest, testParseNestedNamespace); + CppUnit_addTest(pSuite, CppParserTest, testParseInlineNestedNamespace); return pSuite; } diff --git a/CppParser/testsuite/src/CppParserTest.h b/CppParser/testsuite/src/CppParserTest.h index 15a6f371f4..a7642de8a6 100644 --- a/CppParser/testsuite/src/CppParserTest.h +++ b/CppParser/testsuite/src/CppParserTest.h @@ -36,6 +36,8 @@ class CppParserTest: public CppUnit::TestCase void testParseDeleteDefault(); void testParseAnonymousNamespace(); void testParseFriendInline(); + void testParseNestedNamespace(); + void testParseInlineNestedNamespace(); void setUp(); void tearDown(); From 59d91129feaffd26b5aa6524424dc95c8327cd5e Mon Sep 17 00:00:00 2001 From: Toyosatomimi no Miko <110693261+mikomikotaishi@users.noreply.github.com> Date: Sun, 15 Mar 2026 07:20:45 -0400 Subject: [PATCH 3/6] Apply recommended changes --- CppParser/include/Poco/CppParser/NameSpace.h | 5 +- CppParser/src/NameSpace.cpp | 5 +- CppParser/src/Parser.cpp | 10 +- CppParser/testsuite/src/CppParserTest.cpp | 101 ++++++++++++++++++ CppParser/testsuite/src/CppParserTest.h | 3 + Data/ODBC/include/Poco/Data/ODBC/ODBC.h | 10 +- .../tessil/include/Poco/ordered_hash.h | 4 +- 7 files changed, 116 insertions(+), 22 deletions(-) diff --git a/CppParser/include/Poco/CppParser/NameSpace.h b/CppParser/include/Poco/CppParser/NameSpace.h index e42fa9e2bd..4a41bac73c 100644 --- a/CppParser/include/Poco/CppParser/NameSpace.h +++ b/CppParser/include/Poco/CppParser/NameSpace.h @@ -60,7 +60,7 @@ class CppParser_API NameSpace: public Symbol Iterator end() const; /// Returns an iterator for iterating over the NameSpace's Symbol's. - + virtual Symbol* lookup(const std::string& name) const; /// Looks up the given name in the symbol table /// and returns the corresponding symbol, or null @@ -105,7 +105,6 @@ class CppParser_API NameSpace: public Symbol void setInline(bool isInline); /// Sets the inline flag for this namespace. - [[nodiscard]] Symbol::Kind kind() const; std::string toString() const; @@ -124,7 +123,7 @@ class CppParser_API NameSpace: public Symbol SymbolTable _symbols; AliasMap _importedSymbols; NameSpaceVec _importedNameSpaces; - bool _isInline; + bool _isInline = false; }; diff --git a/CppParser/src/NameSpace.cpp b/CppParser/src/NameSpace.cpp index 63dfecf37b..6986ef00d1 100644 --- a/CppParser/src/NameSpace.cpp +++ b/CppParser/src/NameSpace.cpp @@ -27,14 +27,13 @@ namespace Poco::CppParser { NameSpace::NameSpace() { - _isInline = false; } NameSpace::NameSpace(const std::string& name, NameSpace* pNameSpace, bool isInline): - Symbol(name, pNameSpace) + Symbol(name, pNameSpace), + _isInline(isInline) { - _isInline = isInline; } diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp index 264daab4e6..bf2b71d507 100644 --- a/CppParser/src/Parser.cpp +++ b/CppParser/src/Parser.cpp @@ -280,15 +280,7 @@ const Token* Parser::parseNameSpace(const Token* pNext) // update the inline flag pNS->setInline(inlineFlags[i]); } - // Only add the first (outermost) namespace to the global symbol table, - // and only if it's not already there - bool addToGST = false; - if (i == 0) - { - // Check if this namespace is already in the global symbol table - addToGST = (_gst.find(namespaceNames[i]) == _gst.end()); - } - pushNameSpace(pNS, -1, addToGST); + pushNameSpace(pNS, -1, i == 0); nestLevel++; } diff --git a/CppParser/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp index 119eb7ff79..6eceb10c4a 100644 --- a/CppParser/testsuite/src/CppParserTest.cpp +++ b/CppParser/testsuite/src/CppParserTest.cpp @@ -498,6 +498,104 @@ namespace A::inline B::C } +void CppParserTest::testParseRepeatedNestedNamespace() +{ + NameSpace::SymbolTable st; + parseString(R"( +namespace A::B +{ + class X {}; +} +namespace A::B +{ + class Y {}; +} +)", st); + + assertTrue (st.find("A") != st.end()); + NameSpace* pNSA = dynamic_cast(st.find("A")->second); + assertTrue (pNSA != nullptr); + + NameSpace* pNSB = dynamic_cast(pNSA->lookup("B")); + assertTrue (pNSB != nullptr); + + Symbol* pSymX = pNSB->lookup("X"); + assertTrue (pSymX != nullptr); + Struct* pX = dynamic_cast(pSymX); + assertTrue (pX != nullptr); + + Symbol* pSymY = pNSB->lookup("Y"); + assertTrue (pSymY != nullptr); + Struct* pY = dynamic_cast(pSymY); + assertTrue (pY != nullptr); + + assertTrue (pX->fullName() == "A::B::X"); + assertTrue (pY->fullName() == "A::B::Y"); +} + + +void CppParserTest::testParseSingleNamespace() +{ + NameSpace::SymbolTable st; + parseString(R"( +namespace Solo +{ + class Only {}; +} +)", st); + + assertTrue (st.find("Solo") != st.end()); + NameSpace* pNSSolo = dynamic_cast(st.find("Solo")->second); + assertTrue (pNSSolo != nullptr); + + Symbol* pSymOnly = pNSSolo->lookup("Only"); + assertTrue (pSymOnly != nullptr); + Struct* pOnly = dynamic_cast(pSymOnly); + assertTrue (pOnly != nullptr); + assertTrue (pOnly->fullName() == "Solo::Only"); +} + + +void CppParserTest::testParseDeepNestedNamespace() +{ + NameSpace::SymbolTable st; + parseString(R"( +namespace A::B::C::D::E +{ + class Deep {}; +} +class GlobalAfter {}; +)", st); + + assertTrue (st.find("A") != st.end()); + NameSpace* pNSA = dynamic_cast(st.find("A")->second); + assertTrue (pNSA != nullptr); + + NameSpace* pNSB = dynamic_cast(pNSA->lookup("B")); + assertTrue (pNSB != nullptr); + NameSpace* pNSC = dynamic_cast(pNSB->lookup("C")); + assertTrue (pNSC != nullptr); + NameSpace* pNSD = dynamic_cast(pNSC->lookup("D")); + assertTrue (pNSD != nullptr); + NameSpace* pNSE = dynamic_cast(pNSD->lookup("E")); + assertTrue (pNSE != nullptr); + + Symbol* pSymDeep = pNSE->lookup("Deep"); + assertTrue (pSymDeep != nullptr); + Struct* pDeep = dynamic_cast(pSymDeep); + assertTrue (pDeep != nullptr); + assertTrue (pDeep->fullName() == "A::B::C::D::E::Deep"); + + // Verify parser state after namespace pop loop by checking a following global symbol. + assertTrue (st.find("GlobalAfter") != st.end()); + Symbol* pSymGlobalAfter = st.find("GlobalAfter")->second; + assertTrue (pSymGlobalAfter != nullptr); + Struct* pGlobalAfter = dynamic_cast(pSymGlobalAfter); + assertTrue (pGlobalAfter != nullptr); + assertTrue (pGlobalAfter->fullName() == "GlobalAfter"); +} + + void CppParserTest::setUp() { } @@ -525,6 +623,9 @@ CppUnit::Test* CppParserTest::suite() CppUnit_addTest(pSuite, CppParserTest, testParseFriendInline); CppUnit_addTest(pSuite, CppParserTest, testParseNestedNamespace); CppUnit_addTest(pSuite, CppParserTest, testParseInlineNestedNamespace); + CppUnit_addTest(pSuite, CppParserTest, testParseRepeatedNestedNamespace); + CppUnit_addTest(pSuite, CppParserTest, testParseSingleNamespace); + CppUnit_addTest(pSuite, CppParserTest, testParseDeepNestedNamespace); return pSuite; } diff --git a/CppParser/testsuite/src/CppParserTest.h b/CppParser/testsuite/src/CppParserTest.h index a7642de8a6..39ec1bf6e7 100644 --- a/CppParser/testsuite/src/CppParserTest.h +++ b/CppParser/testsuite/src/CppParserTest.h @@ -38,6 +38,9 @@ class CppParserTest: public CppUnit::TestCase void testParseFriendInline(); void testParseNestedNamespace(); void testParseInlineNestedNamespace(); + void testParseRepeatedNestedNamespace(); + void testParseSingleNamespace(); + void testParseDeepNestedNamespace(); void setUp(); void tearDown(); diff --git a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h index f5e0f77249..114ca719f4 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/ODBC.h +++ b/Data/ODBC/include/Poco/Data/ODBC/ODBC.h @@ -84,11 +84,11 @@ // as literal 0, which triggers -Wzero-as-null-pointer-constant warnings in C++. // We define these as nullptr to use in place of the ODBC macros. // -constexpr std::nullptr_t POCO_ODBC_NULL_HANDLE = nullptr; -constexpr std::nullptr_t POCO_ODBC_NULL_HENV = nullptr; -constexpr std::nullptr_t POCO_ODBC_NULL_HDBC = nullptr; -constexpr std::nullptr_t POCO_ODBC_NULL_HSTMT = nullptr; -constexpr std::nullptr_t POCO_ODBC_NULL_HDESC = nullptr; +inline constexpr std::nullptr_t POCO_ODBC_NULL_HANDLE = nullptr; +inline constexpr std::nullptr_t POCO_ODBC_NULL_HENV = nullptr; +inline constexpr std::nullptr_t POCO_ODBC_NULL_HDBC = nullptr; +inline constexpr std::nullptr_t POCO_ODBC_NULL_HSTMT = nullptr; +inline constexpr std::nullptr_t POCO_ODBC_NULL_HDESC = nullptr; // diff --git a/dependencies/tessil/include/Poco/ordered_hash.h b/dependencies/tessil/include/Poco/ordered_hash.h index 87e800f192..90b00b93d4 100644 --- a/dependencies/tessil/include/Poco/ordered_hash.h +++ b/dependencies/tessil/include/Poco/ordered_hash.h @@ -115,7 +115,7 @@ const T& clamp(const T& v, const T& lo, const T& hi) { } template -static T numeric_cast(U value, +T numeric_cast(U value, const char* error_message = "numeric_cast() failed.") { T ret = static_cast(value); if (static_cast(ret) != value) { @@ -143,7 +143,7 @@ static_assert(std::numeric_limits::max() >= "slz_size_type must be >= std::size_t"); template -static T deserialize_value(Deserializer& deserializer) { +T deserialize_value(Deserializer& deserializer) { // MSVC < 2017 is not conformant, circumvent the problem by removing the // template keyword #if defined(_MSC_VER) && _MSC_VER < 1910 From 713c4eff5f6bde47e535e6a423f4d8f6bd36e5c3 Mon Sep 17 00:00:00 2001 From: Toyosatomimi no Miko <110693261+mikomikotaishi@users.noreply.github.com> Date: Wed, 18 Mar 2026 12:56:20 -0400 Subject: [PATCH 4/6] Undo all changes made in dependencies --- .../cpptrace/src/symbols/dwarf/debug_map_resolver.cpp | 6 ++++-- .../cpptrace/src/symbols/dwarf/dwarf_resolver.cpp | 6 ++++-- .../cpptrace/src/symbols/symbols_with_addr2line.cpp | 6 ++++-- .../cpptrace/src/symbols/symbols_with_dbghelp.cpp | 6 ++++-- dependencies/cpptrace/src/symbols/symbols_with_dl.cpp | 6 ++++-- .../cpptrace/src/symbols/symbols_with_libbacktrace.cpp | 6 ++++-- .../cpptrace/src/symbols/symbols_with_libdwarf.cpp | 6 ++++-- .../cpptrace/src/symbols/symbols_with_nothing.cpp | 6 ++++-- dependencies/cpptrace/src/utils/microfmt.cpp | 6 ++++-- dependencies/tessil/include/Poco/ordered_hash.h | 8 ++++++-- dependencies/v8_double_conversion/src/cached-powers.h | 8 ++++++-- 11 files changed, 48 insertions(+), 22 deletions(-) diff --git a/dependencies/cpptrace/src/symbols/dwarf/debug_map_resolver.cpp b/dependencies/cpptrace/src/symbols/dwarf/debug_map_resolver.cpp index 631c67e024..9b63691af6 100644 --- a/dependencies/cpptrace/src/symbols/dwarf/debug_map_resolver.cpp +++ b/dependencies/cpptrace/src/symbols/dwarf/debug_map_resolver.cpp @@ -19,7 +19,8 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail::libdwarf { +namespace detail { +namespace libdwarf { #if IS_APPLE struct target_object { std::string object_path; @@ -200,7 +201,8 @@ namespace detail::libdwarf { return detail::make_unique(object_path); } #endif -} // namespace detail::libdwarf +} +} CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/dwarf/dwarf_resolver.cpp b/dependencies/cpptrace/src/symbols/dwarf/dwarf_resolver.cpp index 8c7983f0a4..909614180c 100644 --- a/dependencies/cpptrace/src/symbols/dwarf/dwarf_resolver.cpp +++ b/dependencies/cpptrace/src/symbols/dwarf/dwarf_resolver.cpp @@ -36,7 +36,8 @@ // https://github.com/ruby/ruby/blob/master/addr2line.c CPPTRACE_BEGIN_NAMESPACE -namespace detail::libdwarf { +namespace detail { +namespace libdwarf { // printbugging as we go constexpr bool dump_dwarf = false; constexpr bool trace_dwarf = false; @@ -1022,7 +1023,8 @@ namespace detail::libdwarf { std::unique_ptr make_dwarf_resolver(cstring_view object_path) { return detail::make_unique(object_path); } -} // namespace detail::libdwarf +} +} CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_addr2line.cpp b/dependencies/cpptrace/src/symbols/symbols_with_addr2line.cpp index fa7463ad42..d31ca86cba 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_addr2line.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_addr2line.cpp @@ -25,7 +25,8 @@ #include "options.hpp" CPPTRACE_BEGIN_NAMESPACE -namespace detail::addr2line { +namespace detail { +namespace addr2line { #if IS_LINUX || IS_APPLE bool has_addr2line() { static std::mutex mutex; @@ -320,7 +321,8 @@ namespace detail::addr2line { } return trace; } -} // namespace detail::addr2line +} +} CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_dbghelp.cpp b/dependencies/cpptrace/src/symbols/symbols_with_dbghelp.cpp index b72e8d1704..559ea462f0 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_dbghelp.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_dbghelp.cpp @@ -23,7 +23,8 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail::dbghelp { +namespace detail { +namespace dbghelp { // SymFromAddr only returns the function's name. In order to get information about parameters, // important for C++ stack traces where functions may be overloaded, we have to manually use // Windows DIA to walk debug info structures. Resources: @@ -445,7 +446,8 @@ namespace detail::dbghelp { } return trace; } -} // namespace detail::dbghelp +} +} CPPTRACE_END_NAMESPACE CPPTRACE_BEGIN_NAMESPACE diff --git a/dependencies/cpptrace/src/symbols/symbols_with_dl.cpp b/dependencies/cpptrace/src/symbols/symbols_with_dl.cpp index 493e8b2904..7887d5108c 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_dl.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_dl.cpp @@ -11,7 +11,8 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail::libdl { +namespace detail { +namespace libdl { stacktrace_frame resolve_frame(const frame_ptr addr) { Dl_info info; if(dladdr(reinterpret_cast(addr), &info)) { // thread-safe @@ -48,7 +49,8 @@ namespace detail::libdl { } return trace; } -} // namespace detail::libdl +} +} CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_libbacktrace.cpp b/dependencies/cpptrace/src/symbols/symbols_with_libbacktrace.cpp index 517ac378d9..5233654f8d 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_libbacktrace.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_libbacktrace.cpp @@ -21,7 +21,8 @@ #endif CPPTRACE_BEGIN_NAMESPACE -namespace detail::libbacktrace { +namespace detail { +namespace libbacktrace { int full_callback(void* data, std::uintptr_t address, const char* file, int line, const char* symbol) { stacktrace_frame& frame = *static_cast(data); frame.raw_address = address; @@ -99,7 +100,8 @@ namespace detail::libbacktrace { } return trace; } -} // namespace detail::libbacktrace +} +} CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_libdwarf.cpp b/dependencies/cpptrace/src/symbols/symbols_with_libdwarf.cpp index b5cd6440fd..5f8334532b 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_libdwarf.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_libdwarf.cpp @@ -19,7 +19,8 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail::libdwarf { +namespace detail { +namespace libdwarf { std::unique_ptr get_resolver_for_object(const std::string& object_path) { #if IS_APPLE // Check if dSYM exist, if not fallback to debug map @@ -176,7 +177,8 @@ namespace detail::libdwarf { // flatten and finish return flatten_inlines(trace); } -} // namespace detail::libdwarf +} +} CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/symbols/symbols_with_nothing.cpp b/dependencies/cpptrace/src/symbols/symbols_with_nothing.cpp index 7249d5cce7..571e1e76af 100644 --- a/dependencies/cpptrace/src/symbols/symbols_with_nothing.cpp +++ b/dependencies/cpptrace/src/symbols/symbols_with_nothing.cpp @@ -7,7 +7,8 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace detail::nothing { +namespace detail { +namespace nothing { std::vector resolve_frames(const std::vector& frames) { return std::vector(frames.size(), null_frame()); } @@ -15,7 +16,8 @@ namespace detail::nothing { std::vector resolve_frames(const std::vector& frames) { return std::vector(frames.size(), null_frame()); } -} // namespace detail::nothing +} +} CPPTRACE_END_NAMESPACE #endif diff --git a/dependencies/cpptrace/src/utils/microfmt.cpp b/dependencies/cpptrace/src/utils/microfmt.cpp index 41611089d6..0f533dc549 100644 --- a/dependencies/cpptrace/src/utils/microfmt.cpp +++ b/dependencies/cpptrace/src/utils/microfmt.cpp @@ -3,11 +3,13 @@ #include CPPTRACE_BEGIN_NAMESPACE -namespace microfmt::detail { +namespace microfmt { +namespace detail { std::ostream& get_cout() { return std::cout; } -} // namespace microfmt::detail +} +} CPPTRACE_END_NAMESPACE diff --git a/dependencies/tessil/include/Poco/ordered_hash.h b/dependencies/tessil/include/Poco/ordered_hash.h index 90b00b93d4..5fb7e6d226 100644 --- a/dependencies/tessil/include/Poco/ordered_hash.h +++ b/dependencies/tessil/include/Poco/ordered_hash.h @@ -83,7 +83,9 @@ #endif #endif -namespace tsl::detail_ordered_hash { +namespace tsl { + +namespace detail_ordered_hash { template struct make_void { @@ -1692,6 +1694,8 @@ class ordered_hash : private Hash, private KeyEqual { bool m_grow_on_next_insert; }; -} // namespace tsl::detail_ordered_hash +} // end namespace detail_ordered_hash + +} // end namespace tsl #endif diff --git a/dependencies/v8_double_conversion/src/cached-powers.h b/dependencies/v8_double_conversion/src/cached-powers.h index 1da76c1566..f38c26d201 100644 --- a/dependencies/v8_double_conversion/src/cached-powers.h +++ b/dependencies/v8_double_conversion/src/cached-powers.h @@ -30,7 +30,9 @@ #include "diy-fp.h" -namespace double_conversion::PowersOfTenCache { +namespace double_conversion { + +namespace PowersOfTenCache { // Not all powers of ten are cached. The decimal exponent of two neighboring // cached numbers will differ by kDecimalExponentDistance. @@ -55,6 +57,8 @@ namespace double_conversion::PowersOfTenCache { DiyFp* power, int* found_exponent); -} // namespace double_conversion::PowersOfTenCache +} // namespace PowersOfTenCache + +} // namespace double_conversion #endif // DOUBLE_CONVERSION_CACHED_POWERS_H_ From a3f451e796f2ddff8638e7cabe07001bdb3a3ca2 Mon Sep 17 00:00:00 2001 From: Toyosatomimi no Miko <110693261+mikomikotaishi@users.noreply.github.com> Date: Fri, 20 Mar 2026 05:30:18 -0400 Subject: [PATCH 5/6] Check for undefined in `pushNamespace()` call --- CppParser/src/Parser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp index bf2b71d507..ba918dbbfd 100644 --- a/CppParser/src/Parser.cpp +++ b/CppParser/src/Parser.cpp @@ -280,7 +280,7 @@ const Token* Parser::parseNameSpace(const Token* pNext) // update the inline flag pNS->setInline(inlineFlags[i]); } - pushNameSpace(pNS, -1, i == 0); + pushNameSpace(pNS, -1, i == 0 && undefined); nestLevel++; } From 67069dc99e10188a513d7b2c0e3d79c1ee5cb489 Mon Sep 17 00:00:00 2001 From: Toyosatomimi no Miko <110693261+mikomikotaishi@users.noreply.github.com> Date: Fri, 20 Mar 2026 10:26:27 -0400 Subject: [PATCH 6/6] Undo the last commit --- CppParser/src/Parser.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CppParser/src/Parser.cpp b/CppParser/src/Parser.cpp index ba918dbbfd..bf2b71d507 100644 --- a/CppParser/src/Parser.cpp +++ b/CppParser/src/Parser.cpp @@ -280,7 +280,7 @@ const Token* Parser::parseNameSpace(const Token* pNext) // update the inline flag pNS->setInline(inlineFlags[i]); } - pushNameSpace(pNS, -1, i == 0 && undefined); + pushNameSpace(pNS, -1, i == 0); nestLevel++; }