Cleanup

hugoam · Nov 21, 2023 · c610053 · c610053
1 parent a58135e
commit c610053
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
diff --git a/dist/two/infra.h b/dist/two/infra.h
@@ -1,6 +1,5 @@
 #pragma once
 
-#include <two/type.h>
 
 
 
@@ -151,7 +150,8 @@ namespace two
 #define TWO_INFRA_EXPORT TWO_IMPORT
 #endif
 
-#ifdef USE_STLnamespace stl
+#ifdef USE_STL
+namespace stl
 {
 	template <class T> struct span;
 	template <class T, size_t Size> struct array;

diff --git a/scripts/toolchain/cpp20.lua b/scripts/toolchain/cpp20.lua
@@ -1,8 +1,8 @@
 -- two toolchain
 -- cpp20 modules
 
-if not cxxmodule then
-    cxxmodule = function(m)
+if not cxxmodules then
+    cxxmodules = function(m)
     end
 end
 
@@ -22,10 +22,16 @@ function modules(m)
     if _ACTION == "vs2017"
 	or _ACTION == "vs2019"
 	or _ACTION == "vs2022" then
-        files {
-          --path.join(m.path, m.dotname .. ".ixx"),
-            path.join(m.path, m.dotname2 .. ".ixx"),
-        }
+        if not m.nomodule then
+            files {
+            --path.join(m.path, m.dotname .. ".ixx"),
+                path.join(m.path, m.dotname2 .. ".ixx"),
+            }
+
+            buildoptions {
+                "/wd5244",
+            }
+        end
     else
         if not m.nomodule then
             local cxxmodule = path.join(m.path, m.dotname2 .. ".cxxm")

diff --git a/src/ui/Edit/TypeIn.h b/src/ui/Edit/TypeIn.h
@@ -198,7 +198,7 @@ namespace two
 
 namespace ui
 {
-	TWO_UI_EXPORT bool filter(const string& filter, const string& value);
+	export_ TWO_UI_EXPORT bool filter(const string& filter, const string& value);
 
 	export_ TWO_UI_EXPORT func_ TextEdit& text_box(Widget& parent, Style& style, string& text, bool editor = false, size_t lines = 1, const string& allowed_chars = "");
 	export_ TWO_UI_EXPORT func_ TextEdit& type_in(Widget& parent, string& text, size_t lines = 1, const string& allowed_chars = "");