From 5a38abe140a554052bbdfaa7db62873fe35b58ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rimas=20Misevi=C4=8Dius?= Date: Wed, 23 Aug 2023 18:30:52 +0300 Subject: [PATCH] Rename macros: WHATWG_... to UPA_... --- examples/urlparse.cpp | 2 +- src/buffer.h | 6 +++--- src/config.h | 30 +++++++++++++++--------------- src/str_arg.h | 14 +++++++------- src/str_view.h | 6 +++--- src/url.h | 36 ++++++++++++++++++------------------ src/url_host.h | 8 ++++---- src/url_idna.h | 6 +++--- src/url_ip.h | 6 +++--- src/url_percent_encode.cpp | 2 +- src/url_percent_encode.h | 26 +++++++++++++------------- src/url_result.h | 6 +++--- src/url_search_params.h | 22 +++++++++++----------- src/url_utf.h | 6 +++--- src/util.h | 10 +++++----- test/test-utils.h | 8 ++++---- test/url_cleanup.h | 6 +++--- tools/dumpCharBitSets.cpp | 2 +- 18 files changed, 101 insertions(+), 101 deletions(-) diff --git a/examples/urlparse.cpp b/examples/urlparse.cpp index 5403b03..882586c 100644 --- a/examples/urlparse.cpp +++ b/examples/urlparse.cpp @@ -228,7 +228,7 @@ void read_samples(const char* file_name, SamplesOutput& out) if (line.empty()) break; state = State::header; - WHATWG_FALLTHROUGH + UPA_FALLTHROUGH case State::header: { bool ok = true; auto icolon = line.find(':'); diff --git a/src/buffer.h b/src/buffer.h index d6016b5..5078e7b 100644 --- a/src/buffer.h +++ b/src/buffer.h @@ -7,8 +7,8 @@ // Copyright 2013 The Chromium Authors. All rights reserved. // -#ifndef WHATWG_BUFFER_H -#define WHATWG_BUFFER_H +#ifndef UPA_BUFFER_H +#define UPA_BUFFER_H #include #include @@ -195,4 +195,4 @@ class simple_buffer { } // namespace upa -#endif // WHATWG_BUFFER_H +#endif // UPA_BUFFER_H diff --git a/src/config.h b/src/config.h index 4182e63..3fa19a6 100644 --- a/src/config.h +++ b/src/config.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef WHATWG_CONFIG_H -#define WHATWG_CONFIG_H +#ifndef UPA_CONFIG_H +#define UPA_CONFIG_H #ifdef __has_include # if __has_include() @@ -12,27 +12,27 @@ # endif #endif -// Define WHATWG_CPP_20 if compiler supports C++20 or later standard +// Define UPA_CPP_20 if compiler supports C++20 or later standard #if defined(_MSVC_LANG) ? (_MSVC_LANG >= 202002) : (__cplusplus >= 202002) -# define WHATWG_CPP_20 +# define UPA_CPP_20 #endif -// Define WHATWG_CPP_17 if compiler supports C++17 or later standard +// Define UPA_CPP_17 if compiler supports C++17 or later standard // https://devblogs.microsoft.com/cppblog/msvc-now-correctly-reports-__cplusplus/ #if defined(_MSVC_LANG) ? (_MSVC_LANG >= 201703) : (__cplusplus >= 201703) -# define WHATWG_CPP_17 -# define WHATWG_FALLTHROUGH [[fallthrough]]; -# define WHATWG_CONSTEXPR_17 constexpr -# define WHATWG_NOEXCEPT_17 noexcept +# define UPA_CPP_17 +# define UPA_FALLTHROUGH [[fallthrough]]; +# define UPA_CONSTEXPR_17 constexpr +# define UPA_NOEXCEPT_17 noexcept #else -# define WHATWG_FALLTHROUGH -# define WHATWG_CONSTEXPR_17 inline -# define WHATWG_NOEXCEPT_17 +# define UPA_FALLTHROUGH +# define UPA_CONSTEXPR_17 inline +# define UPA_NOEXCEPT_17 #endif -// Define WHATWG_CPP_14 if compiler supports C++14 or later +// Define UPA_CPP_14 if compiler supports C++14 or later #if defined(_MSVC_LANG) ? (_MSVC_LANG >= 201402) : (__cplusplus >= 201402) -# define WHATWG_CPP_14 +# define UPA_CPP_14 #endif -#endif // WHATWG_CONFIG_H +#endif // UPA_CONFIG_H diff --git a/src/str_arg.h b/src/str_arg.h index 5739b1d..2b49230 100644 --- a/src/str_arg.h +++ b/src/str_arg.h @@ -15,8 +15,8 @@ inline void procfn(Args&&... args) { } **************************************************************/ -#ifndef WHATWG_STR_ARG_H -#define WHATWG_STR_ARG_H +#ifndef UPA_STR_ARG_H +#define UPA_STR_ARG_H #include "config.h" #include "url_utf.h" @@ -25,19 +25,19 @@ inline void procfn(Args&&... args) { #include #include -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 # include -# define WHATWG_URL_STR_VIEW_TYPE std::string_view +# define UPA_URL_STR_VIEW_TYPE std::string_view #else # include "str_view.h" -# define WHATWG_URL_STR_VIEW_TYPE upa::str_view +# define UPA_URL_STR_VIEW_TYPE upa::str_view #endif namespace upa { // String view type -using url_str_view_t = WHATWG_URL_STR_VIEW_TYPE; +using url_str_view_t = UPA_URL_STR_VIEW_TYPE; // Supported char and size types @@ -279,4 +279,4 @@ inline std::string make_string(Args&&... args) { } // namespace upa -#endif // WHATWG_STR_ARG_H +#endif // UPA_STR_ARG_H diff --git a/src/str_view.h b/src/str_view.h index 9b73964..4a3cae7 100644 --- a/src/str_view.h +++ b/src/str_view.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef STR_VIEW_H -#define STR_VIEW_H +#ifndef UPA_STR_VIEW_H +#define UPA_STR_VIEW_H #include #include @@ -135,4 +135,4 @@ std::basic_ostream& operator<<(std::basic_ostream& } // namespace upa -#endif // STR_VIEW_H +#endif // UPA_STR_VIEW_H diff --git a/src/url.h b/src/url.h index c49933f..c3dad30 100644 --- a/src/url.h +++ b/src/url.h @@ -14,8 +14,8 @@ // https://infra.spec.whatwg.org/ // -#ifndef WHATWG_URL_H -#define WHATWG_URL_H +#ifndef UPA_URL_H +#define UPA_URL_H #include "buffer.h" #include "config.h" @@ -33,7 +33,7 @@ #include // not yet -// #define WHATWG_URL_USE_ENCODING +// #define UPA_URL_USE_ENCODING namespace upa { @@ -105,7 +105,7 @@ class url { /// /// @param[in,out] other URL to move to this object /// @return *this - url& operator=(url&& other) WHATWG_NOEXCEPT_17; + url& operator=(url&& other) UPA_NOEXCEPT_17; /// @brief Safe move assignment. /// @@ -162,7 +162,7 @@ class url { /// @brief Swaps the contents of two URLs /// /// @param[in,out] other URL to exchange the contents with - void swap(url& other) WHATWG_NOEXCEPT_17; + void swap(url& other) UPA_NOEXCEPT_17; // Parser @@ -562,7 +562,7 @@ class url { bool canHaveUsernamePasswordPort() const; // url record - void move_record(url& other) WHATWG_NOEXCEPT_17; + void move_record(url& other) UPA_NOEXCEPT_17; // search params void clear_search_params() noexcept; @@ -971,7 +971,7 @@ inline url::url(url&& other) noexcept search_params_ptr_.set_url_ptr(this); } -inline url& url::operator=(url&& other) WHATWG_NOEXCEPT_17 { +inline url& url::operator=(url&& other) UPA_NOEXCEPT_17 { // move data move_record(other); search_params_ptr_ = std::move(other.search_params_ptr_); @@ -999,7 +999,7 @@ inline url& url::safe_assign(url&& other) { return *this; } -inline void url::move_record(url& other) WHATWG_NOEXCEPT_17 { +inline void url::move_record(url& other) UPA_NOEXCEPT_17 { norm_url_ = std::move(other.norm_url_); part_end_ = other.part_end_; scheme_inf_ = other.scheme_inf_; @@ -1259,7 +1259,7 @@ inline void url::clear() { clear_search_params(); } -inline void url::swap(url& other) WHATWG_NOEXCEPT_17 { +inline void url::swap(url& other) UPA_NOEXCEPT_17 { url tmp{ std::move(*this) }; *this = std::move(other); other = std::move(tmp); @@ -1465,7 +1465,7 @@ inline url_result url_parser::url_parse(url_serializer& urls, const CharT* first const auto length = std::distance(first, last); urls.reserve(length + 32); -#ifdef WHATWG_URL_USE_ENCODING +#ifdef UPA_URL_USE_ENCODING const char* encoding = "UTF-8"; // TODO: If encoding override is given, set encoding to the result of getting an output encoding from encoding override. #endif @@ -1645,7 +1645,7 @@ inline url_result url_parser::url_parse(url_serializer& urls, const CharT* first state = relative_slash_state; break; } - WHATWG_FALLTHROUGH + UPA_FALLTHROUGH default: // Set url's username to base's username, url's password to base's password, url's host to base's host, // url's port to base's port, url's path to base's path, and then remove url's path's last entry, if any @@ -1672,7 +1672,7 @@ inline url_result url_parser::url_parse(url_serializer& urls, const CharT* first ++pointer; break; } - WHATWG_FALLTHROUGH + UPA_FALLTHROUGH default: // set url's username to base's username, url's password to base's password, url's host to base's host, // url's port to base's port @@ -1981,7 +1981,7 @@ inline url_result url_parser::url_parse(url_serializer& urls, const CharT* first break; case '/': ++pointer; - WHATWG_FALLTHROUGH + UPA_FALLTHROUGH default: state = path_state; break; @@ -2059,7 +2059,7 @@ inline url_result url_parser::url_parse(url_serializer& urls, const CharT* first // // 2. If c is "%" and remaining does not start with two ASCII hex digits, validation error. //} -#ifdef WHATWG_URL_USE_ENCODING +#ifdef UPA_URL_USE_ENCODING // scheme_inf_ == nullptr, if unknown scheme if (!urls.scheme_inf() || !urls.scheme_inf()->is_special || urls.scheme_inf()->is_ws) encoding = "UTF-8"; @@ -2394,7 +2394,7 @@ inline std::string& url_serializer::start_part(url::PartType new_pt) { url_.part_end_[url::PASSWORD] = url_.norm_url_.length(); fill_start_pt = url::HOST_START; // (url::PASSWORD + 1) } - WHATWG_FALLTHROUGH + UPA_FALLTHROUGH case url::PASSWORD: if (new_pt == url::HOST) url_.norm_url_ += '@'; @@ -2707,7 +2707,7 @@ inline void url_setter::save_part() { replace_part(url::HOST_START, "", 0, curr_pt_, 0); break; } - WHATWG_FALLTHROUGH + UPA_FALLTHROUGH default: if ((curr_pt_ == url::PASSWORD || curr_pt_ == url::PORT) && empty_val) strp_.clear(); // drop ':' @@ -2880,7 +2880,7 @@ inline bool is_unc_path(const CharT* first, const CharT* last) /// /// @param[in,out] lhs /// @param[in,out] rhs -inline void swap(url& lhs, url& rhs) WHATWG_NOEXCEPT_17 { +inline void swap(url& lhs, url& rhs) UPA_NOEXCEPT_17 { lhs.swap(rhs); } @@ -2949,4 +2949,4 @@ inline url url_from_file_path(StrT&& str) { } // namespace upa -#endif // WHATWG_URL_H +#endif // UPA_URL_H diff --git a/src/url_host.h b/src/url_host.h index 590810a..46ad90f 100644 --- a/src/url_host.h +++ b/src/url_host.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef WHATWG_URL_HOST_H -#define WHATWG_URL_HOST_H +#ifndef UPA_URL_HOST_H +#define UPA_URL_HOST_H #include "buffer.h" #include "str_arg.h" @@ -68,7 +68,7 @@ class url_host { url_host(const url_host&) = default; url_host(url_host&&) noexcept = default; url_host& operator=(const url_host&) = default; - url_host& operator=(url_host&&) WHATWG_NOEXCEPT_17 = default; + url_host& operator=(url_host&&) UPA_NOEXCEPT_17 = default; /// Parsing constructor /// @@ -329,4 +329,4 @@ inline url_result host_parser::parse_ipv6(const CharT* first, const CharT* last, } // namespace upa -#endif // WHATWG_URL_HOST_H +#endif // UPA_URL_HOST_H diff --git a/src/url_idna.h b/src/url_idna.h index 270f2d0..5254e8e 100644 --- a/src/url_idna.h +++ b/src/url_idna.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef WHATWG_URL_IDNA_H -#define WHATWG_URL_IDNA_H +#ifndef UPA_URL_IDNA_H +#define UPA_URL_IDNA_H #include "buffer.h" #include "url_result.h" @@ -18,4 +18,4 @@ void IDNClose(); } // namespace upa -#endif // WHATWG_URL_IDNA_H +#endif // UPA_URL_IDNA_H diff --git a/src/url_ip.h b/src/url_ip.h index 39a129d..24315d2 100644 --- a/src/url_ip.h +++ b/src/url_ip.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef WHATWG_URL_IP_H -#define WHATWG_URL_IP_H +#ifndef UPA_URL_IP_H +#define UPA_URL_IP_H #include "url_percent_encode.h" #include "url_result.h" @@ -384,4 +384,4 @@ void ipv6_serialize(const uint16_t(&address)[8], std::string& output); } // namespace upa -#endif // WHATWG_URL_IP_H +#endif // UPA_URL_IP_H diff --git a/src/url_percent_encode.cpp b/src/url_percent_encode.cpp index 7e7c527..1d6db2a 100644 --- a/src/url_percent_encode.cpp +++ b/src/url_percent_encode.cpp @@ -11,7 +11,7 @@ namespace upa { // NOLINT(modernize-concat-nested-namespaces) -#ifndef WHATWG_CPP_17 +#ifndef UPA_CPP_17 // These data were generated by tools/dumpCharBitSets.cpp program. const code_point_set fragment_no_encode_set = { diff --git a/src/url_percent_encode.h b/src/url_percent_encode.h index c24cb82..6e825ab 100644 --- a/src/url_percent_encode.h +++ b/src/url_percent_encode.h @@ -7,8 +7,8 @@ // Copyright 2013 The Chromium Authors. All rights reserved. // -#ifndef WHATWG_URL_PERCENT_ENCODE_H -#define WHATWG_URL_PERCENT_ENCODE_H +#ifndef UPA_URL_PERCENT_ENCODE_H +#define UPA_URL_PERCENT_ENCODE_H #include "config.h" #include "str_arg.h" @@ -29,7 +29,7 @@ namespace upa { /// class code_point_set { public: -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 /// @brief constructor for code point set initialization /// /// Function @a fun must iniatialize @a self object by using code_point_set @@ -84,12 +84,12 @@ class code_point_set { /// @brief test code point set contains code point @a c /// @param[in] c code point to test template - WHATWG_CONSTEXPR_17 bool operator[](CharT c) const { + UPA_CONSTEXPR_17 bool operator[](CharT c) const { const auto uc = util::to_unsigned(c); return is_8bit(uc) && (arr_[uc >> 3] & (1u << (uc & 0x07))) != 0; } -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 // for dump program static constexpr std::size_t arr_size() noexcept { return arr_size_; } constexpr uint8_t arr_val(std::size_t i) const { return arr_[i]; } @@ -108,7 +108,7 @@ class code_point_set { // Data static const std::size_t arr_size_ = 32; -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 uint8_t arr_[arr_size_] = {}; #else public: @@ -119,7 +119,7 @@ class code_point_set { // Percent encode sets -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 // If you edit following data, then please compile tools/dumpCharBitSets.cpp program // with C++17 compiler, run it and copy output to the url_percent_encode.cpp file. @@ -217,7 +217,7 @@ enum CP_SET : std::uint8_t { class code_points_multiset { public: -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 constexpr code_points_multiset() { // Forbidden host code points: U+0000 NULL, U+0009 TAB, U+000A LF, U+000D CR, // U+0020 SPACE, U+0023 (#), U+002F (/), U+003A (:), U+003C (<), U+003E (>), @@ -271,13 +271,13 @@ class code_points_multiset { /// @param[in] c code point to test /// @param[in] cps code point set template - WHATWG_CONSTEXPR_17 bool char_in_set(CharT c, CP_SET cps) const { + UPA_CONSTEXPR_17 bool char_in_set(CharT c, CP_SET cps) const { const auto uc = util::to_unsigned(c); return is_8bit(uc) && (arr_[uc] & cps); } private: -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 /// @brief include @a c code point to @a cpsbits sets /// @param[in] cpsbits code points sets /// @param[in] c code point to include @@ -329,7 +329,7 @@ class code_points_multiset { // Data static const std::size_t arr_size_ = 256; -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 uint8_t arr_[arr_size_] = {}; #else public: @@ -337,7 +337,7 @@ class code_points_multiset { #endif }; -#ifdef WHATWG_CPP_17 +#ifdef UPA_CPP_17 inline constexpr code_points_multiset code_points; #else extern const code_points_multiset code_points; @@ -601,4 +601,4 @@ inline std::string encode_url_component(StrT&& str) { } // namespace upa -#endif // WHATWG_URL_PERCENT_ENCODE_H +#endif // UPA_URL_PERCENT_ENCODE_H diff --git a/src/url_result.h b/src/url_result.h index f457d84..f9196c5 100644 --- a/src/url_result.h +++ b/src/url_result.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef URL_RESULT_H -#define URL_RESULT_H +#ifndef UPA_URL_RESULT_H +#define UPA_URL_RESULT_H #include @@ -81,4 +81,4 @@ struct result_value { } // namespace detail } // namespace upa -#endif // URL_RESULT_H +#endif // UPA_URL_RESULT_H diff --git a/src/url_search_params.h b/src/url_search_params.h index cef634c..445535f 100644 --- a/src/url_search_params.h +++ b/src/url_search_params.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef WHATWG_URL_SEARCH_PARAMS_H -#define WHATWG_URL_SEARCH_PARAMS_H +#ifndef UPA_URL_SEARCH_PARAMS_H +#define UPA_URL_SEARCH_PARAMS_H #include "config.h" #include "str_arg.h" @@ -152,7 +152,7 @@ class url_search_params /// /// @param[in,out] other url_search_params to move to this object /// @return *this - url_search_params& operator=(url_search_params&& other) WHATWG_NOEXCEPT_17; + url_search_params& operator=(url_search_params&& other) UPA_NOEXCEPT_17; /// @brief Safe move assignment. /// @@ -176,7 +176,7 @@ class url_search_params /// contents of references returned by url::search_params(). /// /// @param[in,out] other url_search_params to exchange the contents with - void swap(url_search_params& other) WHATWG_NOEXCEPT_17; + void swap(url_search_params& other) UPA_NOEXCEPT_17; /// Initializes name-value pairs list by parsing query string. /// @@ -365,7 +365,7 @@ class url_search_params void clear_params() noexcept; void copy_params(const url_search_params& other); - void move_params(url_search_params&& other) WHATWG_NOEXCEPT_17; + void move_params(url_search_params&& other) UPA_NOEXCEPT_17; void parse_params(url_str_view_t query); void update(); @@ -453,7 +453,7 @@ inline url_search_params& url_search_params::operator=(const url_search_params& return *this; } -inline url_search_params& url_search_params::operator=(url_search_params&& other) WHATWG_NOEXCEPT_17 { +inline url_search_params& url_search_params::operator=(url_search_params&& other) UPA_NOEXCEPT_17 { assert(url_ptr_ == nullptr); move_params(std::move(other)); return *this; @@ -473,7 +473,7 @@ inline void url_search_params::clear() { update(); } -inline void url_search_params::swap(url_search_params& other) WHATWG_NOEXCEPT_17 { +inline void url_search_params::swap(url_search_params& other) UPA_NOEXCEPT_17 { assert(url_ptr_ == nullptr && other.url_ptr_ == nullptr); using std::swap; @@ -492,7 +492,7 @@ inline void url_search_params::copy_params(const url_search_params& other) { is_sorted_ = other.is_sorted_; } -inline void url_search_params::move_params(url_search_params&& other) WHATWG_NOEXCEPT_17 { +inline void url_search_params::move_params(url_search_params&& other) UPA_NOEXCEPT_17 { params_ = std::move(other.params_); is_sorted_ = other.is_sorted_; } @@ -707,7 +707,7 @@ inline url_search_params::name_value_list url_search_params::do_parse(bool rem_q break; } } - WHATWG_FALLTHROUGH + UPA_FALLTHROUGH default: pval->push_back(*it); break; @@ -767,11 +767,11 @@ inline std::string url_search_params::to_string() const { /// /// @param[in,out] lhs /// @param[in,out] rhs -inline void swap(url_search_params& lhs, url_search_params& rhs) WHATWG_NOEXCEPT_17 { +inline void swap(url_search_params& lhs, url_search_params& rhs) UPA_NOEXCEPT_17 { lhs.swap(rhs); } } // namespace upa -#endif // WHATWG_URL_SEARCH_PARAMS_H +#endif // UPA_URL_SEARCH_PARAMS_H diff --git a/src/url_utf.h b/src/url_utf.h index 7827896..aa0eb18 100644 --- a/src/url_utf.h +++ b/src/url_utf.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef WHATWG_URL_UTF_H -#define WHATWG_URL_UTF_H +#ifndef UPA_URL_UTF_H +#define UPA_URL_UTF_H #include "buffer.h" #include "url_result.h" @@ -258,4 +258,4 @@ inline void url_utf::append_utf16(uint32_t code_point, simple_buffer @@ -104,7 +104,7 @@ inline void append_tr(std::string& dest, const CharT* first, const CharT* last, std::transform(first, last, buff + old_size, unary_op); return new_size; }); -#elif defined(WHATWG_CPP_17) +#elif defined(UPA_CPP_17) dest.resize(new_size); std::transform(first, last, dest.data() + old_size, unary_op); #else @@ -126,7 +126,7 @@ inline void append_ascii_lowercase(std::string& dest, const CharT* first, const // Finders template -WHATWG_CONSTEXPR_17 bool has_xn_label(const CharT* first, const CharT* last) { +UPA_CONSTEXPR_17 bool has_xn_label(const CharT* first, const CharT* last) { if (last - first >= 4) { // search for labels starting with "xn--" const auto end = last - 4; @@ -145,4 +145,4 @@ WHATWG_CONSTEXPR_17 bool has_xn_label(const CharT* first, const CharT* last) { } // namespace util } // namespace upa -#endif // WHATWG_UTIL_H +#endif // UPA_UTIL_H diff --git a/test/test-utils.h b/test/test-utils.h index b1f6e60..13be8c8 100644 --- a/test/test-utils.h +++ b/test/test-utils.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef TEST_UTILS__H -#define TEST_UTILS__H +#ifndef UPA_TEST_UTILS_H +#define UPA_TEST_UTILS_H #include "config.h" #include @@ -62,7 +62,7 @@ inline bool param_eq(const std::string* pval, const T& value) { template inline bool list_eq(const List& val, std::initializer_list lst) { -#ifdef WHATWG_CPP_14 +#ifdef UPA_CPP_14 return std::equal(std::begin(val), std::end(val), std::begin(lst), std::end(lst)); #else return @@ -75,4 +75,4 @@ template using pairs_list_t = std::initializer_list>;; -#endif // TEST_UTILS__H +#endif // UPA_TEST_UTILS_H diff --git a/test/url_cleanup.h b/test/url_cleanup.h index 88d8876..65494f7 100644 --- a/test/url_cleanup.h +++ b/test/url_cleanup.h @@ -3,8 +3,8 @@ // found in the LICENSE file. // -#ifndef WHATWG_URL_CLEANUP_H -#define WHATWG_URL_CLEANUP_H +#ifndef UPA_URL_CLEANUP_H +#define UPA_URL_CLEANUP_H // For ICU cleanup #include "url_idna.h" @@ -21,4 +21,4 @@ inline void url_cleanup() } -#endif // WHATWG_URL_CLEANUP_H +#endif // UPA_URL_CLEANUP_H diff --git a/tools/dumpCharBitSets.cpp b/tools/dumpCharBitSets.cpp index 5c0ee86..9fae36b 100644 --- a/tools/dumpCharBitSets.cpp +++ b/tools/dumpCharBitSets.cpp @@ -7,7 +7,7 @@ #include #include -#ifndef WHATWG_CPP_17 +#ifndef UPA_CPP_17 #error "This file requires C++17 compiler" #endif