Skip to content

Y
ygopro
Commit 1aba6674 authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'upstream/patch-wcscpy' into develop

parents 23c372bd 817e1a22
Pipeline #30636 failed with stages
        in 4 minutes and 45 seconds
        Show whitespace changes
        Inline Side-by-side
        Showing with 3 additions and 2 deletions
        gframe/irrUString.h
        View file @ 1aba6674
        ...@@ -38,6 +38,7 @@ ...@@ -38,6 +38,7 @@
        #include <utility> #include <utility>
        #include <iterator> #include <iterator>
        #include <string>
        namespace irr { namespace irr {
        ...@@ -387,7 +388,7 @@ public: ...@@ -387,7 +388,7 @@ public:
        } }
        template <class T> template <class T>
        ustring16(const T& other) ustring16(const std::basic_string<T>& other)
        : data_(nullptr), size_(0), size_raw_(0) { : data_(nullptr), size_(0), size_raw_(0) {
        assign(other.data(), static_cast<u32>(other.size())); assign(other.data(), static_cast<u32>(other.size()));
        } }
        ...@@ -421,7 +422,7 @@ public: ...@@ -421,7 +422,7 @@ public:
        } }
        template <class T> template <class T>
        ustring16& operator=(const T& other) { ustring16& operator=(const std::basic_string<T>& other) {
        assign(other.data(), static_cast<u32>(other.size())); assign(other.data(), static_cast<u32>(other.size()));
        return *this; return *this;
        } }
        ......
        Markdown is supported
        0% or
        You are about to add 0 people to the discussion. Proceed with caution.
        Finish editing this message first!
        Please register or to comment