Browse Source

Fix renaming of sys classes and abstracts for cppia. Closes #9879

Hugh Sanderson 4 years ago
parent
commit
103fc4df74
2 changed files with 9 additions and 8 deletions
  1. 3 3
      std/cpp/_std/sys/thread/Thread.hx
  2. 6 5
      std/cpp/cppia/HostClasses.hx

+ 3 - 3
std/cpp/_std/sys/thread/Thread.hx

@@ -167,15 +167,15 @@ private class HaxeThread {
 		messages.add(msg);
 		messages.add(msg);
 	}
 	}
 
 
-	static inline function currentHandle():ThreadHandle {
+	static #if !scriptable inline #end function currentHandle():ThreadHandle {
 		return untyped __global__.__hxcpp_thread_current();
 		return untyped __global__.__hxcpp_thread_current();
 	}
 	}
 
 
-	static inline function createHandle(callb:Void->Void):ThreadHandle {
+	static #if !scriptable inline #end function createHandle(callb:Void->Void):ThreadHandle {
 		return untyped __global__.__hxcpp_thread_create(callb);
 		return untyped __global__.__hxcpp_thread_create(callb);
 	}
 	}
 
 
-	public static inline function readMessage(block:Bool):Dynamic {
+	public static #if !scriptable inline #end function readMessage(block:Bool):Dynamic {
 		return current().messages.pop(block);
 		return current().messages.pop(block);
 	}
 	}
 }
 }

+ 6 - 5
std/cpp/cppia/HostClasses.hx

@@ -41,14 +41,15 @@ class HostClasses {
 		"cpp.NativeArray",
 		"cpp.NativeArray",
 		"cpp.NativeString",
 		"cpp.NativeString",
 		"cpp.vm.Debugger",
 		"cpp.vm.Debugger",
-		"cpp.vm.Deque",
+		"sys.thread.Deque",
+		"sys.thread.Lock",
+		"sys.thread.Mutex",
+		"sys.thread.Thread",
+		"sys.thread.Tls",
+		"sys.thread._Thread.HaxeThread",
 		"cpp.vm.ExecutionTrace",
 		"cpp.vm.ExecutionTrace",
 		"cpp.vm.Gc",
 		"cpp.vm.Gc",
-		"cpp.vm.Lock",
-		"cpp.vm.Mutex",
 		"cpp.vm.Profiler",
 		"cpp.vm.Profiler",
-		"cpp.vm.Thread",
-		"cpp.vm.Tls",
 		"cpp.vm.Unsafe",
 		"cpp.vm.Unsafe",
 		"cpp.vm.WeakRef",
 		"cpp.vm.WeakRef",
 		"cpp.Object",
 		"cpp.Object",