diff --git a/base/poco/CMakeLists.txt b/base/poco/CMakeLists.txt index 0432ce196bf..82c48b5b622 100644 --- a/base/poco/CMakeLists.txt +++ b/base/poco/CMakeLists.txt @@ -1,6 +1,3 @@ -set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -w") -set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -w") - add_subdirectory (Crypto) add_subdirectory (Data) add_subdirectory (Data/ODBC) diff --git a/base/poco/Crypto/CMakeLists.txt b/base/poco/Crypto/CMakeLists.txt index 3753c5eed7b..d11a437fc02 100644 --- a/base/poco/Crypto/CMakeLists.txt +++ b/base/poco/Crypto/CMakeLists.txt @@ -4,7 +4,24 @@ if (ENABLE_SSL) add_library (_poco_crypto ${SRCS}) add_library (Poco::Crypto ALIAS _poco_crypto) - target_compile_options (_poco_crypto PRIVATE -Wno-newline-eof) + # TODO: remove these warning exclusions + target_compile_options (_poco_crypto + PRIVATE + -Wno-covered-switch-default + -Wno-deprecated-dynamic-exception-spec + -Wno-extra-semi-stmt + -Wno-missing-noreturn + -Wno-newline-eof + -Wno-old-style-cast + -Wno-shadow + -Wno-shorten-64-to-32 + -Wno-sign-compare + -Wno-suggest-destructor-override + -Wno-suggest-override + -Wno-unreachable-code-return + -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant + ) target_include_directories (_poco_crypto SYSTEM PUBLIC "include") target_link_libraries (_poco_crypto PUBLIC Poco::Foundation OpenSSL::SSL OpenSSL::Crypto) diff --git a/base/poco/Data/CMakeLists.txt b/base/poco/Data/CMakeLists.txt index 142d3592b69..dfdf3194f3c 100644 --- a/base/poco/Data/CMakeLists.txt +++ b/base/poco/Data/CMakeLists.txt @@ -3,5 +3,18 @@ file (GLOB SRCS src/*.cpp) add_library (_poco_data ${SRCS}) add_library (Poco::Data ALIAS _poco_data) +# TODO: remove these warning exclusions +target_compile_options (_poco_data + PRIVATE + -Wno-comma + -Wno-covered-switch-default + -Wno-deprecated-dynamic-exception-spec + -Wno-extra-semi-stmt + -Wno-old-style-cast + -Wno-shorten-64-to-32 + -Wno-sign-compare + -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant +) target_include_directories (_poco_data SYSTEM PUBLIC "include") target_link_libraries (_poco_data PUBLIC Poco::Foundation) diff --git a/base/poco/Data/ODBC/CMakeLists.txt b/base/poco/Data/ODBC/CMakeLists.txt index 4a49f915b67..73f2c81ea6c 100644 --- a/base/poco/Data/ODBC/CMakeLists.txt +++ b/base/poco/Data/ODBC/CMakeLists.txt @@ -23,7 +23,20 @@ if (ENABLE_ODBC) add_library (_poco_data_odbc ${SRCS}) add_library (Poco::Data::ODBC ALIAS _poco_data_odbc) - target_compile_options (_poco_data_odbc PRIVATE -Wno-unused-variable) + # TODO: remove these warning exclusions + target_compile_options (_poco_data_odbc + PRIVATE + -Wno-cast-qual + -Wno-deprecated-dynamic-exception-spec + -Wno-extra-semi-stmt + -Wno-old-style-cast + -Wno-sign-compare + -Wno-tautological-constant-out-of-range-compare + -Wno-tautological-unsigned-zero-compare + -Wno-unused-parameter + -Wno-unused-variable + -Wno-zero-as-null-pointer-constant + ) target_include_directories (_poco_data_odbc SYSTEM PUBLIC "include") target_link_libraries (_poco_data_odbc PUBLIC Poco::Data ch_contrib::unixodbc) diff --git a/base/poco/Data/ODBC/include/Poco/Data/ODBC/Preparator.h b/base/poco/Data/ODBC/include/Poco/Data/ODBC/Preparator.h index aa38ea28ce9..ac771b625b3 100644 --- a/base/poco/Data/ODBC/include/Poco/Data/ODBC/Preparator.h +++ b/base/poco/Data/ODBC/include/Poco/Data/ODBC/Preparator.h @@ -570,7 +570,7 @@ private: if (Utility::isError(SQLBindCol(_rStmt, (SQLUSMALLINT) pos + 1, valueType, - (SQLPOINTER) pVal, + (SQLPOINTER) pVal, (SQLINTEGER) dataSize, &_lengths[pos]))) { diff --git a/base/poco/Data/include/Poco/Data/RecordSet.h b/base/poco/Data/include/Poco/Data/RecordSet.h index 050b3892725..91046c36b9f 100644 --- a/base/poco/Data/include/Poco/Data/RecordSet.h +++ b/base/poco/Data/include/Poco/Data/RecordSet.h @@ -460,7 +460,7 @@ private: } else { - throw Poco::BadCastException(Poco::format("Type cast failed!\nColumn: %z\nTarget type:\t%s", + throw Poco::BadCastException(Poco::format("Type cast failed!\nColumn: %z\nTarget type:\t%s", pos, std::string(typeid(T).name()))); } diff --git a/base/poco/Foundation/CMakeLists.txt b/base/poco/Foundation/CMakeLists.txt index 3e7c7ae3e3e..dceb18e68cc 100644 --- a/base/poco/Foundation/CMakeLists.txt +++ b/base/poco/Foundation/CMakeLists.txt @@ -5,7 +5,21 @@ file (GLOB SRCS_PCRE src/pcre_*.c) add_library (_poco_foundation_pcre ${SRCS_PCRE}) add_library (Poco::Foundation::PCRE ALIAS _poco_foundation_pcre) -target_compile_options (_poco_foundation_pcre PRIVATE -Wno-sign-compare) +# TODO: remove these warning exclusions +target_compile_options (_poco_foundation_pcre + PRIVATE + -Wno-cast-align + -Wno-cast-qual + -Wno-comma + -Wno-conditional-uninitialized + -Wno-extra-semi-stmt + -Wno-implicit-fallthrough + -Wno-reserved-identifier + -Wno-sign-compare + -Wno-unknown-pragmas + -Wno-unreachable-code-break + -Wno-unused-macros +) # Foundation @@ -169,21 +183,39 @@ set (SRCS add_library (_poco_foundation ${SRCS}) add_library (Poco::Foundation ALIAS _poco_foundation) +# TODO: remove these warning exclusions target_compile_options (_poco_foundation PRIVATE + -Wno-array-bounds -Wno-atomic-implicit-seq-cst + -Wno-cast-align + -Wno-cast-qual + -Wno-class-varargs + -Wno-covered-switch-default -Wno-deprecated -Wno-extra-semi-stmt - -Wno-zero-as-null-pointer-constant + -Wno-implicit-fallthrough -Wno-implicit-int-float-conversion + -Wno-misleading-indentation + -Wno-missing-noreturn + -Wno-old-style-cast + -Wno-redundant-parens + -Wno-reserved-identifier + -Wno-reserved-macro-identifier + -Wno-shadow + -Wno-shorten-64-to-32 + -Wno-sign-compare + -Wno-suggest-destructor-override + -Wno-suggest-override + -Wno-tautological-unsigned-zero-compare -Wno-thread-safety-analysis -Wno-thread-safety-negative -) - -target_compile_options (_poco_foundation - PRIVATE - -Wno-sign-compare + -Wno-undef + -Wno-unreachable-code-return + -Wno-unused-exception-parameter + -Wno-unused-macros -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant ) target_compile_definitions (_poco_foundation diff --git a/base/poco/Foundation/include/Poco/HexBinaryDecoder.h b/base/poco/Foundation/include/Poco/HexBinaryDecoder.h index 7aab0f6cd22..7878cdede20 100644 --- a/base/poco/Foundation/include/Poco/HexBinaryDecoder.h +++ b/base/poco/Foundation/include/Poco/HexBinaryDecoder.h @@ -29,7 +29,7 @@ namespace Poco { class Foundation_API HexBinaryDecoderBuf: public UnbufferedStreamBuf /// This streambuf decodes all hexBinary-encoded data read /// from the istream connected to it. - /// In hexBinary encoding, each binary octet is encoded as a character tuple, + /// In hexBinary encoding, each binary octet is encoded as a character tuple, /// consisting of two hexadecimal digits ([0-9a-fA-F]) representing the octet code. /// See also: XML Schema Part 2: Datatypes (http://www.w3.org/TR/xmlschema-2/), /// section 3.2.15. @@ -71,7 +71,7 @@ protected: class Foundation_API HexBinaryDecoder: public HexBinaryDecoderIOS, public std::istream /// This istream decodes all hexBinary-encoded data read /// from the istream connected to it. - /// In hexBinary encoding, each binary octet is encoded as a character tuple, + /// In hexBinary encoding, each binary octet is encoded as a character tuple, /// consisting of two hexadecimal digits ([0-9a-fA-F]) representing the octet code. /// See also: XML Schema Part 2: Datatypes (http://www.w3.org/TR/xmlschema-2/), /// section 3.2.15. diff --git a/base/poco/Foundation/include/Poco/HexBinaryEncoder.h b/base/poco/Foundation/include/Poco/HexBinaryEncoder.h index 453c3cd821c..f2670d5d2a5 100644 --- a/base/poco/Foundation/include/Poco/HexBinaryEncoder.h +++ b/base/poco/Foundation/include/Poco/HexBinaryEncoder.h @@ -29,8 +29,8 @@ namespace Poco { class Foundation_API HexBinaryEncoderBuf: public UnbufferedStreamBuf /// This streambuf encodes all data written /// to it in hexBinary encoding and forwards it to a connected - /// ostream. - /// In hexBinary encoding, each binary octet is encoded as a character tuple, + /// ostream. + /// In hexBinary encoding, each binary octet is encoded as a character tuple, /// consisting of two hexadecimal digits ([0-9a-fA-F]) representing the octet code. /// See also: XML Schema Part 2: Datatypes (http://www.w3.org/TR/xmlschema-2/), /// section 3.2.15. @@ -95,7 +95,7 @@ class Foundation_API HexBinaryEncoder: public HexBinaryEncoderIOS, public std::o /// Always call close() when done /// writing data, to ensure proper /// completion of the encoding operation. - /// In hexBinary encoding, each binary octet is encoded as a character tuple, + /// In hexBinary encoding, each binary octet is encoded as a character tuple, /// consisting of two hexadecimal digits ([0-9a-fA-F]) representing the octet code. /// See also: XML Schema Part 2: Datatypes (http://www.w3.org/TR/xmlschema-2/), /// section 3.2.15. diff --git a/base/poco/Foundation/include/Poco/UnicodeConverter.h b/base/poco/Foundation/include/Poco/UnicodeConverter.h index 0733b67b7d9..da37e89d847 100644 --- a/base/poco/Foundation/include/Poco/UnicodeConverter.h +++ b/base/poco/Foundation/include/Poco/UnicodeConverter.h @@ -37,7 +37,7 @@ public: static void convert(const std::string& utf8String, UTF32String& utf32String); /// Converts the given UTF-8 encoded string into an UTF-32 encoded wide string. - static void convert(const char* utf8String, std::size_t length, UTF32String& utf32String); + static void convert(const char* utf8String, std::size_t length, UTF32String& utf32String); /// Converts the given UTF-8 encoded character sequence into an UTF-32 encoded wide string. static void convert(const char* utf8String, UTF32String& utf32String); @@ -46,7 +46,7 @@ public: static void convert(const std::string& utf8String, UTF16String& utf16String); /// Converts the given UTF-8 encoded string into an UTF-16 encoded wide string. - static void convert(const char* utf8String, std::size_t length, UTF16String& utf16String); + static void convert(const char* utf8String, std::size_t length, UTF16String& utf16String); /// Converts the given UTF-8 encoded character sequence into an UTF-16 encoded wide string. static void convert(const char* utf8String, UTF16String& utf16String); @@ -58,7 +58,7 @@ public: static void convert(const UTF32String& utf32String, std::string& utf8String); /// Converts the given UTF-32 encoded wide string into an UTF-8 encoded string. - static void convert(const UTF16Char* utf16String, std::size_t length, std::string& utf8String); + static void convert(const UTF16Char* utf16String, std::size_t length, std::string& utf8String); /// Converts the given zero-terminated UTF-16 encoded wide character sequence into an UTF-8 encoded string. static void convert(const UTF32Char* utf16String, std::size_t length, std::string& utf8String); diff --git a/base/poco/Foundation/src/DateTimeParser.cpp b/base/poco/Foundation/src/DateTimeParser.cpp index b58482c7b33..c89c232f4a0 100644 --- a/base/poco/Foundation/src/DateTimeParser.cpp +++ b/base/poco/Foundation/src/DateTimeParser.cpp @@ -276,11 +276,11 @@ int DateTimeParser::parseTZD(std::string::const_iterator& it, const std::string: {"PDT", -7*3600}, {"AKST", -9*3600}, {"AKDT", -8*3600}, - {"HST", -10*3600}, + {"HST", -10*3600}, {"AEST", 10*3600}, {"AEDT", 11*3600}, - {"ACST", 9*3600+1800}, - {"ACDT", 10*3600+1800}, + {"ACST", 9*3600+1800}, + {"ACDT", 10*3600+1800}, {"AWST", 8*3600}, {"AWDT", 9*3600} }; diff --git a/base/poco/Foundation/src/MD5Engine.cpp b/base/poco/Foundation/src/MD5Engine.cpp index 7ac89f0bd37..06a549ec192 100644 --- a/base/poco/Foundation/src/MD5Engine.cpp +++ b/base/poco/Foundation/src/MD5Engine.cpp @@ -224,7 +224,7 @@ void MD5Engine::transform (UInt32 state[4], const unsigned char block[64]) GG (c, d, a, b, x[11], S23, 0x265e5a51); /* 19 */ GG (b, c, d, a, x[ 0], S24, 0xe9b6c7aa); /* 20 */ GG (a, b, c, d, x[ 5], S21, 0xd62f105d); /* 21 */ - GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ + GG (d, a, b, c, x[10], S22, 0x2441453); /* 22 */ GG (c, d, a, b, x[15], S23, 0xd8a1e681); /* 23 */ GG (b, c, d, a, x[ 4], S24, 0xe7d3fbc8); /* 24 */ GG (a, b, c, d, x[ 9], S21, 0x21e1cde6); /* 25 */ @@ -248,7 +248,7 @@ void MD5Engine::transform (UInt32 state[4], const unsigned char block[64]) HH (a, b, c, d, x[13], S31, 0x289b7ec6); /* 41 */ HH (d, a, b, c, x[ 0], S32, 0xeaa127fa); /* 42 */ HH (c, d, a, b, x[ 3], S33, 0xd4ef3085); /* 43 */ - HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ + HH (b, c, d, a, x[ 6], S34, 0x4881d05); /* 44 */ HH (a, b, c, d, x[ 9], S31, 0xd9d4d039); /* 45 */ HH (d, a, b, c, x[12], S32, 0xe6db99e5); /* 46 */ HH (c, d, a, b, x[15], S33, 0x1fa27cf8); /* 47 */ diff --git a/base/poco/Foundation/src/UnicodeConverter.cpp b/base/poco/Foundation/src/UnicodeConverter.cpp index 992c644c614..f0a7742d00c 100644 --- a/base/poco/Foundation/src/UnicodeConverter.cpp +++ b/base/poco/Foundation/src/UnicodeConverter.cpp @@ -86,7 +86,7 @@ void UnicodeConverter::convert(const std::string& utf8String, UTF16String& utf16 } -void UnicodeConverter::convert(const char* utf8String, std::size_t length, UTF16String& utf16String) +void UnicodeConverter::convert(const char* utf8String, std::size_t length, UTF16String& utf16String) { if (!utf8String || !length) { @@ -130,7 +130,7 @@ void UnicodeConverter::convert(const UTF32String& utf32String, std::string& utf8 } -void UnicodeConverter::convert(const UTF16Char* utf16String, std::size_t length, std::string& utf8String) +void UnicodeConverter::convert(const UTF16Char* utf16String, std::size_t length, std::string& utf8String) { utf8String.clear(); UTF8Encoding utf8Encoding; @@ -140,7 +140,7 @@ void UnicodeConverter::convert(const UTF16Char* utf16String, std::size_t length } -void UnicodeConverter::convert(const UTF32Char* utf32String, std::size_t length, std::string& utf8String) +void UnicodeConverter::convert(const UTF32Char* utf32String, std::size_t length, std::string& utf8String) { toUTF8(UTF32String(utf32String, length), utf8String); } diff --git a/base/poco/JSON/CMakeLists.txt b/base/poco/JSON/CMakeLists.txt index 96fa00d098d..482399cba28 100644 --- a/base/poco/JSON/CMakeLists.txt +++ b/base/poco/JSON/CMakeLists.txt @@ -7,6 +7,17 @@ set (SRCS_PDJSON add_library (_poco_json_pdjson ${SRCS_PDJSON}) add_library (Poco::JSON::Pdjson ALIAS _poco_json_pdjson) +# TODO: remove these warning exclusions +target_compile_options (_poco_json_pdjson + PRIVATE + -Wno-cast-qual + -Wno-declaration-after-statement + -Wno-extra-semi-stmt + -Wno-implicit-fallthrough + -Wno-shorten-64-to-32 + -Wno-unreachable-code-return +) + # Poco::JSON file (GLOB SRCS src/*.cpp) @@ -14,5 +25,16 @@ file (GLOB SRCS src/*.cpp) add_library (_poco_json ${SRCS}) add_library (Poco::JSON ALIAS _poco_json) +# TODO: remove these warning exclusions +target_compile_options (_poco_json + PRIVATE + -Wno-deprecated-dynamic-exception-spec + -Wno-sign-compare + -Wno-suggest-destructor-override + -Wno-suggest-override + -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant +) + target_include_directories (_poco_json SYSTEM PUBLIC "include") target_link_libraries (_poco_json PUBLIC Poco::Foundation Poco::JSON::Pdjson) diff --git a/base/poco/MongoDB/CMakeLists.txt b/base/poco/MongoDB/CMakeLists.txt index 92589fe438f..8f5c6be2cae 100644 --- a/base/poco/MongoDB/CMakeLists.txt +++ b/base/poco/MongoDB/CMakeLists.txt @@ -3,5 +3,13 @@ file (GLOB SRCS src/*.cpp) add_library (_poco_mongodb ${SRCS}) add_library (Poco::MongoDB ALIAS _poco_mongodb) +# TODO: remove these warning exclusions +target_compile_options (_poco_mongodb + PRIVATE + -Wno-old-style-cast + -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant +) + target_include_directories (_poco_mongodb SYSTEM PUBLIC "include") target_link_libraries (_poco_mongodb PUBLIC Poco::Net) diff --git a/base/poco/Net/CMakeLists.txt b/base/poco/Net/CMakeLists.txt index da58f20e07b..792045c9b43 100644 --- a/base/poco/Net/CMakeLists.txt +++ b/base/poco/Net/CMakeLists.txt @@ -9,17 +9,31 @@ elseif (OS_DARWIN OR OS_FREEBSD) target_compile_definitions (_poco_net PUBLIC POCO_HAVE_FD_POLL) endif () +# TODO: remove these warning exclusions target_compile_options (_poco_net PRIVATE -Wno-atomic-implicit-seq-cst - -Wno-extra-semi-stmt - -Wno-extra-semi -) - -target_compile_options (_poco_net - PRIVATE + -Wno-cast-align + -Wno-cast-qual + -Wno-comma + -Wno-covered-switch-default -Wno-deprecated -Wno-extra-semi + -Wno-extra-semi-stmt + -Wno-missing-noreturn + -Wno-old-style-cast + -Wno-shadow + -Wno-shorten-64-to-32 + -Wno-sign-compare + -Wno-suggest-destructor-override + -Wno-suggest-override + -Wno-undef + -Wno-unreachable-code + -Wno-unreachable-code-return + -Wno-unused-macros + -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant ) + target_include_directories (_poco_net SYSTEM PUBLIC "include") target_link_libraries (_poco_net PUBLIC Poco::Foundation) diff --git a/base/poco/Net/include/Poco/Net/ServerSocket.h b/base/poco/Net/include/Poco/Net/ServerSocket.h index d8aca6790ae..d206dd534ce 100644 --- a/base/poco/Net/include/Poco/Net/ServerSocket.h +++ b/base/poco/Net/include/Poco/Net/ServerSocket.h @@ -131,7 +131,7 @@ public: /// If the library has not been built with IPv6 support, /// a Poco::NotImplementedException will be thrown. - virtual void bind6(const SocketAddress& address, bool reuseAddress, bool reusePort, bool ipV6Only); + virtual void bind6(const SocketAddress& address, bool reuseAddress, bool reusePort, bool ipV6Only); /// Binds a local IPv6 address to the socket. /// /// This is usually only done when establishing a server diff --git a/base/poco/Net/include/Poco/Net/SocketImpl.h b/base/poco/Net/include/Poco/Net/SocketImpl.h index d1fec1de7d6..b88f620dd65 100644 --- a/base/poco/Net/include/Poco/Net/SocketImpl.h +++ b/base/poco/Net/include/Poco/Net/SocketImpl.h @@ -114,7 +114,7 @@ public: /// If the library has not been built with IPv6 support, /// a Poco::NotImplementedException will be thrown. - virtual void bind6(const SocketAddress& address, bool reuseAddress, bool reusePort, bool ipV6Only); + virtual void bind6(const SocketAddress& address, bool reuseAddress, bool reusePort, bool ipV6Only); /// Bind a local IPv6 address to the socket. /// /// This is usually only done when establishing a server diff --git a/base/poco/NetSSL_OpenSSL/CMakeLists.txt b/base/poco/NetSSL_OpenSSL/CMakeLists.txt index 9ec5acaab02..0c200184932 100644 --- a/base/poco/NetSSL_OpenSSL/CMakeLists.txt +++ b/base/poco/NetSSL_OpenSSL/CMakeLists.txt @@ -4,6 +4,24 @@ if (ENABLE_SSL) add_library (_poco_net_ssl ${SRCS}) add_library (Poco::Net::SSL ALIAS _poco_net_ssl) + # TODO: remove these warning exclusions + target_compile_options (_poco_net_ssl + PRIVATE + -Wno-cast-qual + -Wno-covered-switch-default + -Wno-deprecated-copy-with-user-provided-dtor + -Wno-deprecated-dynamic-exception-spec + -Wno-extra-semi + -Wno-extra-semi-stmt + -Wno-implicit-fallthrough + -Wno-old-style-cast + -Wno-shorten-64-to-32 + -Wno-sign-compare + -Wno-unused-exception-parameter + -Wno-unused-macros + -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant + ) target_include_directories (_poco_net_ssl SYSTEM PUBLIC "include") target_link_libraries (_poco_net_ssl PUBLIC Poco::Crypto Poco::Net Poco::Util) else () diff --git a/base/poco/Redis/CMakeLists.txt b/base/poco/Redis/CMakeLists.txt index 562957140ba..f906b2d6183 100644 --- a/base/poco/Redis/CMakeLists.txt +++ b/base/poco/Redis/CMakeLists.txt @@ -3,6 +3,14 @@ file (GLOB SRCS src/*.cpp) add_library (_poco_redis ${SRCS}) add_library (Poco::Redis ALIAS _poco_redis) -target_compile_options (_poco_redis PRIVATE -Wno-shadow) +# TODO: remove these warning exclusions +target_compile_options (_poco_redis + PRIVATE + -Wno-deprecated-dynamic-exception-spec + -Wno-shadow + -Wno-shorten-64-to-32 + -Wno-sign-compare + -Wno-zero-as-null-pointer-constant +) target_include_directories (_poco_redis SYSTEM PUBLIC "include") target_link_libraries (_poco_redis PUBLIC Poco::Net) diff --git a/base/poco/Util/CMakeLists.txt b/base/poco/Util/CMakeLists.txt index f37e099e648..52da9730d67 100644 --- a/base/poco/Util/CMakeLists.txt +++ b/base/poco/Util/CMakeLists.txt @@ -3,5 +3,19 @@ file (GLOB SRCS src/*.cpp) add_library (_poco_util ${SRCS}) add_library (Poco::Util ALIAS _poco_util) +# TODO: remove these warning exclusions +target_compile_options (_poco_util + PRIVATE + -Wno-deprecated-dynamic-exception-spec + -Wno-extra-semi-stmt + -Wno-newline-eof + -Wno-old-style-cast + -Wno-shadow + -Wno-sign-compare + -Wno-suggest-destructor-override + -Wno-suggest-override + -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant +) target_include_directories (_poco_util SYSTEM PUBLIC "include") target_link_libraries (_poco_util PUBLIC Poco::JSON Poco::XML) diff --git a/base/poco/Util/include/Poco/Util/Units.h b/base/poco/Util/include/Poco/Util/Units.h index e7f3869dda4..47e8fe3c3aa 100644 --- a/base/poco/Util/include/Poco/Util/Units.h +++ b/base/poco/Util/include/Poco/Util/Units.h @@ -848,7 +848,7 @@ UNIT_DISPLAY_NAME(Units::T, "T"); UNIT_DISPLAY_NAME(Units::H, "H"); UNIT_DISPLAY_NAME(Units::lx, "lx"); UNIT_DISPLAY_NAME(Units::Gy, "Gy"); -UNIT_DISPLAY_NAME(Units::kat, "kat"); +UNIT_DISPLAY_NAME(Units::kat, "kat"); namespace Units diff --git a/base/poco/Util/src/ServerApplication.cpp b/base/poco/Util/src/ServerApplication.cpp index 99107151e3b..dbfa5d703d9 100644 --- a/base/poco/Util/src/ServerApplication.cpp +++ b/base/poco/Util/src/ServerApplication.cpp @@ -143,7 +143,7 @@ void ServerApplication::ServiceControlHandler(DWORD control) case SERVICE_CONTROL_INTERROGATE: break; } - SetServiceStatus(_serviceStatusHandle, &_serviceStatus); + SetServiceStatus(_serviceStatusHandle, &_serviceStatus); } diff --git a/base/poco/XML/CMakeLists.txt b/base/poco/XML/CMakeLists.txt index 992cfbe763c..4b875e7071e 100644 --- a/base/poco/XML/CMakeLists.txt +++ b/base/poco/XML/CMakeLists.txt @@ -5,6 +5,17 @@ file (GLOB SRCS_EXPAT src/xml*.c) add_library (_poco_xml_expat ${SRCS_EXPAT}) add_library (Poco::XML::Expat ALIAS _poco_xml_expat) +# TODO: remove these warning exclusions +target_compile_options (_poco_xml_expat + PRIVATE + -Wno-cast-qual + -Wno-empty-translation-unit + -Wno-extra-semi-stmt + -Wno-implicit-fallthrough + -Wno-reserved-identifier + -Wno-unused-macros +) + target_include_directories (_poco_xml_expat PUBLIC "include") target_include_directories (_poco_xml_expat PRIVATE "../Foundation/include") @@ -14,6 +25,25 @@ file (GLOB SRCS src/*.cpp) add_library (_poco_xml ${SRCS}) add_library (Poco::XML ALIAS _poco_xml) -target_compile_options (_poco_xml PRIVATE -Wno-old-style-cast) +# TODO: remove these warning exclusions +target_compile_options (_poco_xml + PRIVATE + -Wno-cast-qual + -Wno-deprecated-dynamic-exception-spec + -Wno-implicit-fallthrough + -Wno-missing-noreturn + -Wno-old-style-cast + -Wno-reserved-identifier + -Wno-shadow + -Wno-shorten-64-to-32 + -Wno-suggest-destructor-override + -Wno-suggest-override + -Wno-tautological-type-limit-compare + -Wno-tautological-unsigned-zero-compare + -Wno-unreachable-code + -Wno-unused-macros + -Wno-unused-parameter + -Wno-zero-as-null-pointer-constant +) target_include_directories (_poco_xml SYSTEM PUBLIC "include") target_link_libraries (_poco_xml PUBLIC Poco::Foundation Poco::XML::Expat) diff --git a/base/poco/XML/include/Poco/XML/expat.h b/base/poco/XML/include/Poco/XML/expat.h index c9214f64070..93a5d19d53f 100644 --- a/base/poco/XML/include/Poco/XML/expat.h +++ b/base/poco/XML/include/Poco/XML/expat.h @@ -7,33 +7,33 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper + Copyright (c) 2000 Clark Cooper Copyright (c) 2000-2005 Fred L. Drake, Jr. Copyright (c) 2001-2002 Greg Stein Copyright (c) 2002-2016 Karl Waclawek Copyright (c) 2016-2022 Sebastian Pipping - Copyright (c) 2016 Cristian Rodríguez - Copyright (c) 2016 Thomas Beutlich - Copyright (c) 2017 Rhodri James - Copyright (c) 2022 Thijs Schreijer + Copyright (c) 2016 Cristian Rodríguez + Copyright (c) 2016 Thomas Beutlich + Copyright (c) 2017 Rhodri James + Copyright (c) 2022 Thijs Schreijer Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/include/Poco/XML/expat_external.h b/base/poco/XML/include/Poco/XML/expat_external.h index 8829f770910..9c5fc8a2e8b 100644 --- a/base/poco/XML/include/Poco/XML/expat_external.h +++ b/base/poco/XML/include/Poco/XML/expat_external.h @@ -7,32 +7,32 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper + Copyright (c) 2000 Clark Cooper Copyright (c) 2000-2004 Fred L. Drake, Jr. Copyright (c) 2001-2002 Greg Stein Copyright (c) 2002-2006 Karl Waclawek - Copyright (c) 2016 Cristian Rodríguez + Copyright (c) 2016 Cristian Rodríguez Copyright (c) 2016-2019 Sebastian Pipping - Copyright (c) 2017 Rhodri James - Copyright (c) 2018 Yury Gribov + Copyright (c) 2017 Rhodri James + Copyright (c) 2018 Yury Gribov Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/ascii.h b/base/poco/XML/src/ascii.h index 1f594d2e54b..5e696150817 100644 --- a/base/poco/XML/src/ascii.h +++ b/base/poco/XML/src/ascii.h @@ -7,28 +7,28 @@ |_| XML parser Copyright (c) 1999-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper - Copyright (c) 2002 Fred L. Drake, Jr. - Copyright (c) 2007 Karl Waclawek - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2000 Clark Cooper + Copyright (c) 2002 Fred L. Drake, Jr. + Copyright (c) 2007 Karl Waclawek + Copyright (c) 2017 Sebastian Pipping Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/asciitab.h b/base/poco/XML/src/asciitab.h index 1f6453a4d0b..86df212f5a1 100644 --- a/base/poco/XML/src/asciitab.h +++ b/base/poco/XML/src/asciitab.h @@ -7,27 +7,27 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper - Copyright (c) 2002 Fred L. Drake, Jr. - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2000 Clark Cooper + Copyright (c) 2002 Fred L. Drake, Jr. + Copyright (c) 2017 Sebastian Pipping Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/iasciitab.h b/base/poco/XML/src/iasciitab.h index 29853841fc6..44bd93f691e 100644 --- a/base/poco/XML/src/iasciitab.h +++ b/base/poco/XML/src/iasciitab.h @@ -7,27 +7,27 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper - Copyright (c) 2002 Fred L. Drake, Jr. - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2000 Clark Cooper + Copyright (c) 2002 Fred L. Drake, Jr. + Copyright (c) 2017 Sebastian Pipping Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/internal.h b/base/poco/XML/src/internal.h index ea906711448..d9e592052f9 100644 --- a/base/poco/XML/src/internal.h +++ b/base/poco/XML/src/internal.h @@ -27,28 +27,28 @@ Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2002-2006 Karl Waclawek - Copyright (c) 2003 Greg Stein + Copyright (c) 2003 Greg Stein Copyright (c) 2016-2021 Sebastian Pipping - Copyright (c) 2018 Yury Gribov - Copyright (c) 2019 David Loffredo + Copyright (c) 2018 Yury Gribov + Copyright (c) 2019 David Loffredo Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/latin1tab.h b/base/poco/XML/src/latin1tab.h index 34ab055f703..a63ebd6a122 100644 --- a/base/poco/XML/src/latin1tab.h +++ b/base/poco/XML/src/latin1tab.h @@ -7,27 +7,27 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper - Copyright (c) 2002 Fred L. Drake, Jr. - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2000 Clark Cooper + Copyright (c) 2002 Fred L. Drake, Jr. + Copyright (c) 2017 Sebastian Pipping Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/nametab.h b/base/poco/XML/src/nametab.h index 63485446b96..e8cf8d7d9d2 100644 --- a/base/poco/XML/src/nametab.h +++ b/base/poco/XML/src/nametab.h @@ -10,22 +10,22 @@ Copyright (c) 2017 Sebastian Pipping Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/utf8tab.h b/base/poco/XML/src/utf8tab.h index 51387789ed6..4e28ec2e9a9 100644 --- a/base/poco/XML/src/utf8tab.h +++ b/base/poco/XML/src/utf8tab.h @@ -7,27 +7,27 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper - Copyright (c) 2002 Fred L. Drake, Jr. - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2000 Clark Cooper + Copyright (c) 2002 Fred L. Drake, Jr. + Copyright (c) 2017 Sebastian Pipping Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/xmlparse.cpp b/base/poco/XML/src/xmlparse.cpp index 99570a1fb12..3207ac3ddbd 100644 --- a/base/poco/XML/src/xmlparse.cpp +++ b/base/poco/XML/src/xmlparse.cpp @@ -7,52 +7,52 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper + Copyright (c) 2000 Clark Cooper Copyright (c) 2000-2006 Fred L. Drake, Jr. Copyright (c) 2001-2002 Greg Stein Copyright (c) 2002-2016 Karl Waclawek Copyright (c) 2005-2009 Steven Solie - Copyright (c) 2016 Eric Rahm + Copyright (c) 2016 Eric Rahm Copyright (c) 2016-2022 Sebastian Pipping - Copyright (c) 2016 Gaurav - Copyright (c) 2016 Thomas Beutlich - Copyright (c) 2016 Gustavo Grieco - Copyright (c) 2016 Pascal Cuoq - Copyright (c) 2016 Ed Schouten + Copyright (c) 2016 Gaurav + Copyright (c) 2016 Thomas Beutlich + Copyright (c) 2016 Gustavo Grieco + Copyright (c) 2016 Pascal Cuoq + Copyright (c) 2016 Ed Schouten Copyright (c) 2017-2018 Rhodri James - Copyright (c) 2017 Václav Slavík - Copyright (c) 2017 Viktor Szakats - Copyright (c) 2017 Chanho Park - Copyright (c) 2017 Rolf Eike Beer - Copyright (c) 2017 Hans Wennborg - Copyright (c) 2018 Anton Maklakov - Copyright (c) 2018 Benjamin Peterson - Copyright (c) 2018 Marco Maggi - Copyright (c) 2018 Mariusz Zaborski - Copyright (c) 2019 David Loffredo + Copyright (c) 2017 Václav Slavík + Copyright (c) 2017 Viktor Szakats + Copyright (c) 2017 Chanho Park + Copyright (c) 2017 Rolf Eike Beer + Copyright (c) 2017 Hans Wennborg + Copyright (c) 2018 Anton Maklakov + Copyright (c) 2018 Benjamin Peterson + Copyright (c) 2018 Marco Maggi + Copyright (c) 2018 Mariusz Zaborski + Copyright (c) 2019 David Loffredo Copyright (c) 2019-2020 Ben Wagner - Copyright (c) 2019 Vadim Zeitlin - Copyright (c) 2021 Dong-hee Na - Copyright (c) 2022 Samanta Navarro - Copyright (c) 2022 Jeffrey Walton + Copyright (c) 2019 Vadim Zeitlin + Copyright (c) 2021 Dong-hee Na + Copyright (c) 2022 Samanta Navarro + Copyright (c) 2022 Jeffrey Walton Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/xmlrole.h b/base/poco/XML/src/xmlrole.h index d6e1fa150a1..0262f7b24c8 100644 --- a/base/poco/XML/src/xmlrole.h +++ b/base/poco/XML/src/xmlrole.h @@ -7,28 +7,28 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper - Copyright (c) 2002 Karl Waclawek - Copyright (c) 2002 Fred L. Drake, Jr. - Copyright (c) 2017 Sebastian Pipping + Copyright (c) 2000 Clark Cooper + Copyright (c) 2002 Karl Waclawek + Copyright (c) 2002 Fred L. Drake, Jr. + Copyright (c) 2017 Sebastian Pipping Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/xmltok.h b/base/poco/XML/src/xmltok.h index 6f630c2f9ba..4e786a14307 100644 --- a/base/poco/XML/src/xmltok.h +++ b/base/poco/XML/src/xmltok.h @@ -7,29 +7,29 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper - Copyright (c) 2002 Fred L. Drake, Jr. + Copyright (c) 2000 Clark Cooper + Copyright (c) 2002 Fred L. Drake, Jr. Copyright (c) 2002-2005 Karl Waclawek Copyright (c) 2016-2017 Sebastian Pipping - Copyright (c) 2017 Rhodri James + Copyright (c) 2017 Rhodri James Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/base/poco/XML/src/xmltok_impl.h b/base/poco/XML/src/xmltok_impl.h index c518aada013..97e222b00c7 100644 --- a/base/poco/XML/src/xmltok_impl.h +++ b/base/poco/XML/src/xmltok_impl.h @@ -7,26 +7,26 @@ |_| XML parser Copyright (c) 1997-2000 Thai Open Source Software Center Ltd - Copyright (c) 2000 Clark Cooper + Copyright (c) 2000 Clark Cooper Copyright (c) 2017-2019 Sebastian Pipping Licensed under the MIT license: - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, + Permission is hereby granted, free of charge, to any person obtaining + a copy of this software and associated documentation files (the + "Software"), to deal in the Software without restriction, including + without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit - persons to whom the Software is furnished to do so, subject to the + persons to whom the Software is furnished to do so, subject to the following conditions: - The above copyright notice and this permission notice shall be included + The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN - NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, - DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR + NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, + DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ diff --git a/utils/check-style/check-whitespaces b/utils/check-style/check-whitespaces index 331190f7804..5a20569868d 100755 --- a/utils/check-style/check-whitespaces +++ b/utils/check-style/check-whitespaces @@ -1,7 +1,7 @@ #!/usr/bin/env bash ROOT_PATH=$(git rev-parse --show-toplevel) -EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|poco/|memcpy/|consistent-hashing/|Parsers/New' +EXCLUDE_DIRS='build/|integration/|widechar_width/|glibc-compatibility/|memcpy/|consistent-hashing/|Parsers/New' # Double whitespaces find $ROOT_PATH/{src,base,programs,utils} -name '*.h' -or -name '*.cpp' 2>/dev/null |