gansm / finalcut

A text-based widget toolkit
https://github.com/gansm/finalcut/wiki/First-steps#first-steps-with-the-final-cut-widget-toolkit
GNU Lesser General Public License v3.0
981 stars 52 forks source link

[FIX] Unable to build latest "main" without this #139

Closed SchweinDeBurg closed 1 month ago

SchweinDeBurg commented 1 month ago
commit e8a003c4b7d2afd4be05b46b258112dca38fd010 (HEAD -> main)
Author: Elijah Zarezky <elijah@zarezky.spb.ru>
Date:   Thu Jul 11 05:34:12 2024 +0300

    Fix build

diff --git a/final/util/fstring.cpp b/final/util/fstring.cpp
index c9dd1e4a..4748a326 100644
--- a/final/util/fstring.cpp
+++ b/final/util/fstring.cpp
@@ -914,12 +914,6 @@ auto FString::includes (const FString& s) const -> bool

 // private methods of FString
-//----------------------------------------------------------------------
-inline void FString::internal_assign (std::wstring s)
-{
-  s.swap(string);
-}
-
 //----------------------------------------------------------------------
 auto FString::internal_toCharString (const std::wstring& s) const -> std::string
 {
@@ -943,7 +937,7 @@ auto FString::internal_toCharString (const std::wstring& s) const -> std::string
 }

 //----------------------------------------------------------------------
-inline auto FString::internal_toWideString (const std::string& s) const -> std::wstring
+auto FString::internal_toWideString (const std::string& s) const -> std::wstring
 {
   if ( s.empty() )
     return {};
diff --git a/final/util/fstring.h b/final/util/fstring.h
index 85adc9c6..94d30eec 100644
--- a/final/util/fstring.h
+++ b/final/util/fstring.h
@@ -701,6 +701,12 @@ inline auto FString::back() const -> const_reference
   return string.back();
 }

+//----------------------------------------------------------------------
+inline void FString::internal_assign (std::wstring s)
+{
+  s.swap(string);
+}
+
 //----------------------------------------------------------------------
 template <typename... Args>
 inline auto FString::sprintf (const FString& format, Args&&... args) -> FString&
gansm commented 1 month ago

Thanks for the patch