Several improvements

include/lsp-plug.in/common/finally.h

@@ -1,6 +1,6 @@
 /*
- * Copyright (C) 2022 Linux Studio Plugins Project <https://lsp-plug.in/>
- *           (C) 2022 Vladimir Sadovnikov <[email protected]>
+ * Copyright (C) 2024 Linux Studio Plugins Project <https://lsp-plug.in/>
+ *           (C) 2024 Vladimir Sadovnikov <[email protected]>
  *
  * This file is part of lsp-common-lib
  * Created on: 29 июн. 2022 г.
@@ -23,6 +23,7 @@
 #define LSP_PLUG_IN_COMMON_FINALLY_H_
 
 #include <lsp-plug.in/common/version.h>
+#include <lsp-plug.in/common/variadic.h>
 
 namespace lsp
 {
@@ -33,23 +34,24 @@ namespace lsp
             T       sActor;
 
         public:
-            inline FinallyExecutor(T && actor): sActor(actor) {}
+            inline FinallyExecutor(T && actor): sActor(lsp::move(actor)) {}
             inline FinallyExecutor(T & actor) : sActor(actor) {}
             ~FinallyExecutor()  { sActor(); }
     };
 
     struct FinallyExecutorInit
     {
         template <class T>
-            inline FinallyExecutor<T> operator + (T & actor)
-            {
-                return FinallyExecutor<T>(actor);
-            }
+        inline FinallyExecutor<T> operator + (T & actor)
+        {
+            return FinallyExecutor<T>(actor);
+        }
+
         template <class T>
-            inline FinallyExecutor<T> operator + (T && actor)
-            {
-                return FinallyExecutor<T>(actor);
-            }
+        inline FinallyExecutor<T> operator + (T && actor)
+        {
+            return FinallyExecutor<T>(lsp::move(actor));
+        }
     };
 
     #define lsp_impl_finally2(id, prefix) prefix ## id ## __
@@ -59,14 +61,6 @@ namespace lsp
 
     #define lsp_finally lsp_impl_finally0(__COUNTER__)
 
-    template <class T>
-    inline T * release_ptr(T * & value)
-    {
-        T *res  = value;
-        value   = nullptr;
-        return res;
-    }
-
 } /* namespace lsp */
 
 #endif /* LSP_PLUG_IN_COMMON_FINALLY_H_ */

include/lsp-plug.in/common/types.h

@@ -977,6 +977,14 @@ namespace lsp
             return (value) ? bits | flag : bits & (~flag);
         }
 
+    template <class T>
+    inline T * release_ptr(T * & value)
+    {
+        T *res  = value;
+        value   = nullptr;
+        return res;
+    }
+
     LSP_COMMON_LIB_PUBLIC
     int version_cmp(const version_t *a, const version_t *b);
 

include/lsp-plug.in/stdlib/locale.h

@@ -29,6 +29,10 @@
 #include <locale.h>
 #include <string.h>
 
+#ifdef PLATFORM_MACOSX
+    #include <xlocale.h>
+#endif /* PLATFORM_MACOSX */
+
 #define SET_LOCALE_MANGLE2(prefix, postfix) prefix ## _ ## postfix
 #define SET_LOCALE_MANGLE1(prefix, postfix) SET_LOCALE_MANGLE2(prefix, postfix)
 #define SET_LOCALE_MANGLE(var) SET_LOCALE_MANGLE1(var, __COUNTER__)