Bring back Word/UWord type aliases

scala-native · Dec 20, 2021 · 1811456 · 1811456
1 parent 204aff9
commit 1811456
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 4 deletions.
diff --git a/nativelib/src/main/scala/scala/scalanative/unsafe/package.scala b/nativelib/src/main/scala/scala/scalanative/unsafe/package.scala
@@ -15,6 +15,14 @@ import scala.scalanative.meta.LinktimeInfo
 package object unsafe extends unsafe.UnsafePackageCompat {
   val is32BitPlatform = LinktimeInfo.is32BitPlatform
 
+  /** Int on 32-bit architectures and Long on 64-bit ones. */
+  @deprecated("Word type is deprecated, use Size instead", since = "0.5.0")
+  type Word = Size
+
+  /** UInt on 32-bit architectures and ULong on 64-bit ones. */
+  @deprecated("UWord type is deprecated, use USize instead", since = "0.5.0")
+  type UWord = USize
+
   /** The C 'char' type. */
   type CChar = Byte
 

diff --git a/windowslib/src/main/scala/scala/scalanative/windows/FileApi.scala b/windowslib/src/main/scala/scala/scalanative/windows/FileApi.scala
@@ -1,7 +1,7 @@
 package scala.scalanative.windows
 
 import scala.language.implicitConversions
-import scala.scalanative.unsafe._
+import scala.scalanative.unsafe.{Word => _, _}
 import scala.scalanative.unsigned._
 import scala.scalanative.windows.HandleApi.Handle
 import MinWinBaseApi._

diff --git a/windowslib/src/main/scala/scala/scalanative/windows/MinWinBaseApi.scala b/windowslib/src/main/scala/scala/scalanative/windows/MinWinBaseApi.scala
@@ -1,6 +1,6 @@
 package scala.scalanative.windows
 
-import scala.scalanative.unsafe._
+import scala.scalanative.unsafe.{Word => _, _}
 import scala.scalanative.unsigned._
 import scala.language.implicitConversions
 import scala.scalanative.windows.util.Conversion

diff --git a/windowslib/src/main/scala/scala/scalanative/windows/ProcessThreadsApi.scala b/windowslib/src/main/scala/scala/scalanative/windows/ProcessThreadsApi.scala
@@ -1,6 +1,6 @@
 package scala.scalanative.windows
 
-import scala.scalanative.unsafe._
+import scala.scalanative.unsafe.{Word => _, _}
 import scalanative.unsigned._
 import HandleApi.Handle
 import WinBaseApi.SecurityAttributes

diff --git a/windowslib/src/main/scala/scala/scalanative/windows/SecurityBaseApi.scala b/windowslib/src/main/scala/scala/scalanative/windows/SecurityBaseApi.scala
@@ -1,6 +1,6 @@
 package scala.scalanative.windows
 
-import scala.scalanative.unsafe._
+import scala.scalanative.unsafe.{Word => _, _}
 import scala.scalanative.unsigned._
 import scala.scalanative.windows.HandleApi.Handle