Update vendored libraries.

diff --git a/vendor/README.md b/vendor/README.md
index b6445d79138e69d74c00003a990d10b190ef9bf7..1f5396be2e9937726408deb68b96cc2aa7159f84 100644 (file)
--- a/vendor/README.md
+++ b/vendor/README.md
@@ -38,7 +38,7 @@ This directory contains vendored dependencies that are shipped with InspIRCd to
 
 **License** — Boost Software License
 
-**Version** — v3.1.1
+**Version** — v3.1.2
 
 **Website** — [https://github.com/nemtrif/utfcpp](https://github.com/nemtrif/utfcpp)
 

diff --git a/vendor/utfcpp/utf8/checked.h b/vendor/utfcpp/utf8/checked.h
index 648636e4686ae6bf2dd16a42c656e2e0affbe559..71b9076f63d2733704c76f1fc5c694fc5436ba43 100644 (file)
--- a/vendor/utfcpp/utf8/checked.h
+++ b/vendor/utfcpp/utf8/checked.h
@@ -42,7 +42,7 @@ namespace utf8
         uint32_t cp;
     public:
         invalid_code_point(uint32_t codepoint) : cp(codepoint) {}
-        virtual const char* what() const NOEXCEPT OVERRIDE { return "Invalid code point"; }
+        virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid code point"; }
         uint32_t code_point() const {return cp;}
     };
 
@@ -50,7 +50,7 @@ namespace utf8
         uint8_t u8;
     public:
         invalid_utf8 (uint8_t u) : u8(u) {}
-        virtual const char* what() const NOEXCEPT OVERRIDE { return "Invalid UTF-8"; }
+        virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid UTF-8"; }
         uint8_t utf8_octet() const {return u8;}
     };
 
@@ -58,13 +58,13 @@ namespace utf8
         uint16_t u16;
     public:
         invalid_utf16 (uint16_t u) : u16(u) {}
-        virtual const char* what() const NOEXCEPT OVERRIDE { return "Invalid UTF-16"; }
+        virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Invalid UTF-16"; }
         uint16_t utf16_word() const {return u16;}
     };
 
     class not_enough_room : public exception {
     public:
-        virtual const char* what() const NOEXCEPT OVERRIDE { return "Not enough space"; }
+        virtual const char* what() const UTF_CPP_NOEXCEPT UTF_CPP_OVERRIDE { return "Not enough space"; }
     };
 
     /// The library API - functions intended to be called by the users

diff --git a/vendor/utfcpp/utf8/core.h b/vendor/utfcpp/utf8/core.h
index 244e892311243bd3c54c7f210f17a9d6322bd40d..de6199f2a3a75553db08ad9c6dfac7a2f8841e91 100644 (file)
--- a/vendor/utfcpp/utf8/core.h
+++ b/vendor/utfcpp/utf8/core.h
@@ -39,11 +39,11 @@ DEALINGS IN THE SOFTWARE.
 #endif
 
 #if UTF_CPP_CPLUSPLUS >= 201103L // C++ 11 or later
-    #define OVERRIDE override
-    #define NOEXCEPT noexcept
+    #define UTF_CPP_OVERRIDE override
+    #define UTF_CPP_NOEXCEPT noexcept
 #else // C++ 98/03
-    #define OVERRIDE
-    #define NOEXCEPT throw()
+    #define UTF_CPP_OVERRIDE
+    #define UTF_CPP_NOEXCEPT throw()
 #endif // C++ 11 or later