From d7a0bf1fa7483845c198a6f09c8ec19d3d298a5b Mon Sep 17 00:00:00 2001 From: Andre Nguyen Date: Thu, 20 Aug 2020 22:06:26 -0400 Subject: [PATCH] replace noexcept with NOEXCEPT macro --- include/date/tz.h | 44 ++++++++++++++++++++++---------------------- src/tz.cpp | 12 ++++++------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/include/date/tz.h b/include/date/tz.h index 5a0e9e0..4028afd 100644 --- a/include/date/tz.h +++ b/include/date/tz.h @@ -1226,31 +1226,31 @@ class tzdb_list public: ~tzdb_list(); tzdb_list() = default; - tzdb_list(tzdb_list&& x) noexcept; + tzdb_list(tzdb_list&& x) NOEXCEPT; - const tzdb& front() const noexcept {return *head_;} - tzdb& front() noexcept {return *head_;} + const tzdb& front() const NOEXCEPT {return *head_;} + tzdb& front() NOEXCEPT {return *head_;} class const_iterator; - const_iterator begin() const noexcept; - const_iterator end() const noexcept; + const_iterator begin() const NOEXCEPT; + const_iterator end() const NOEXCEPT; - const_iterator cbegin() const noexcept; - const_iterator cend() const noexcept; + const_iterator cbegin() const NOEXCEPT; + const_iterator cend() const NOEXCEPT; - const_iterator erase_after(const_iterator p) noexcept; + const_iterator erase_after(const_iterator p) NOEXCEPT; struct undocumented_helper; private: - void push_front(tzdb* tzdb) noexcept; + void push_front(tzdb* tzdb) NOEXCEPT; }; class tzdb_list::const_iterator { tzdb* p_ = nullptr; - explicit const_iterator(tzdb* p) noexcept : p_{p} {} + explicit const_iterator(tzdb* p) NOEXCEPT : p_{p} {} public: const_iterator() = default; @@ -1260,20 +1260,20 @@ public: using pointer = const value_type*; using difference_type = std::ptrdiff_t; - reference operator*() const noexcept {return *p_;} - pointer operator->() const noexcept {return p_;} + reference operator*() const NOEXCEPT {return *p_;} + pointer operator->() const NOEXCEPT {return p_;} - const_iterator& operator++() noexcept {p_ = p_->next; return *this;} - const_iterator operator++(int) noexcept {auto t = *this; ++(*this); return t;} + const_iterator& operator++() NOEXCEPT {p_ = p_->next; return *this;} + const_iterator operator++(int) NOEXCEPT {auto t = *this; ++(*this); return t;} friend bool - operator==(const const_iterator& x, const const_iterator& y) noexcept + operator==(const const_iterator& x, const const_iterator& y) NOEXCEPT {return x.p_ == y.p_;} friend bool - operator!=(const const_iterator& x, const const_iterator& y) noexcept + operator!=(const const_iterator& x, const const_iterator& y) NOEXCEPT {return !(x == y);} friend class tzdb_list; @@ -1281,28 +1281,28 @@ public: inline tzdb_list::const_iterator -tzdb_list::begin() const noexcept +tzdb_list::begin() const NOEXCEPT { return const_iterator{head_}; } inline tzdb_list::const_iterator -tzdb_list::end() const noexcept +tzdb_list::end() const NOEXCEPT { return const_iterator{nullptr}; } inline tzdb_list::const_iterator -tzdb_list::cbegin() const noexcept +tzdb_list::cbegin() const NOEXCEPT { return begin(); } inline tzdb_list::const_iterator -tzdb_list::cend() const noexcept +tzdb_list::cend() const NOEXCEPT { return end(); } @@ -1333,7 +1333,7 @@ namespace detail template inline T* -to_raw_pointer(T* p) noexcept +to_raw_pointer(T* p) NOEXCEPT { return p; } @@ -1341,7 +1341,7 @@ to_raw_pointer(T* p) noexcept template inline auto -to_raw_pointer(Pointer p) noexcept +to_raw_pointer(Pointer p) NOEXCEPT -> decltype(detail::to_raw_pointer(p.operator->())) { return detail::to_raw_pointer(p.operator->()); diff --git a/src/tz.cpp b/src/tz.cpp index b5f0244..87b14df 100644 --- a/src/tz.cpp +++ b/src/tz.cpp @@ -420,20 +420,20 @@ tzdb_list::~tzdb_list() } } -tzdb_list::tzdb_list(tzdb_list&& x) noexcept +tzdb_list::tzdb_list(tzdb_list&& x) NOEXCEPT : head_{x.head_.exchange(nullptr)} { } void -tzdb_list::push_front(tzdb* tzdb) noexcept +tzdb_list::push_front(tzdb* tzdb) NOEXCEPT { tzdb->next = head_; head_ = tzdb; } tzdb_list::const_iterator -tzdb_list::erase_after(const_iterator p) noexcept +tzdb_list::erase_after(const_iterator p) NOEXCEPT { auto t = p.p_->next; p.p_->next = p.p_->next->next; @@ -443,7 +443,7 @@ tzdb_list::erase_after(const_iterator p) noexcept struct tzdb_list::undocumented_helper { - static void push_front(tzdb_list& db_list, tzdb* tzdb) noexcept + static void push_front(tzdb_list& db_list, tzdb* tzdb) NOEXCEPT { db_list.push_front(tzdb); } @@ -3305,8 +3305,8 @@ remote_download(const std::string& version, char* error_buffer) { auto mapping_file = get_download_mapping_file(version); result = download_to_file( - "https://raw.githubusercontent.com/unicode-org/cldr/master/" - "common/supplemental/windowsZones.xml", + "https://raw.githubusercontent.com/unicode-org/cldr/master/" + "common/supplemental/windowsZones.xml", mapping_file, download_file_options::text, error_buffer); } # endif // _WIN32