From 0e8faf0bb9fec712e9039110662e2e406fcbce18 Mon Sep 17 00:00:00 2001
From: v7878 <46866705+vova7878@users.noreply.github.com>
Date: Fri, 12 Apr 2024 23:55:04 +0700
Subject: [PATCH] Fix compilation

---
 .../java/com/v7878/foreign/_VarHandleSegmentViewBase.java | 8 ++++----
 .../src/main/java/com/v7878/unsafe/ExtraMemoryAccess.java | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/AndroidPanama/src/main/java/com/v7878/foreign/_VarHandleSegmentViewBase.java b/AndroidPanama/src/main/java/com/v7878/foreign/_VarHandleSegmentViewBase.java
index 56c6800b..896e65d8 100644
--- a/AndroidPanama/src/main/java/com/v7878/foreign/_VarHandleSegmentViewBase.java
+++ b/AndroidPanama/src/main/java/com/v7878/foreign/_VarHandleSegmentViewBase.java
@@ -1,10 +1,10 @@
 package com.v7878.foreign;
 
 import static com.v7878.misc.Math.convEndian;
-import static com.v7878.unsafe.Utils.d2l;
-import static com.v7878.unsafe.Utils.f2i;
-import static com.v7878.unsafe.Utils.i2f;
-import static com.v7878.unsafe.Utils.l2d;
+import static com.v7878.misc.Math.d2l;
+import static com.v7878.misc.Math.f2i;
+import static com.v7878.misc.Math.i2f;
+import static com.v7878.misc.Math.l2d;
 import static com.v7878.unsafe.Utils.shouldNotReachHere;
 import static com.v7878.unsafe.invoke.VarHandleImpl.isReadOnly;
 
diff --git a/AndroidUnsafe/src/main/java/com/v7878/unsafe/ExtraMemoryAccess.java b/AndroidUnsafe/src/main/java/com/v7878/unsafe/ExtraMemoryAccess.java
index ceb4083a..82500f87 100644
--- a/AndroidUnsafe/src/main/java/com/v7878/unsafe/ExtraMemoryAccess.java
+++ b/AndroidUnsafe/src/main/java/com/v7878/unsafe/ExtraMemoryAccess.java
@@ -33,6 +33,10 @@
 import static com.v7878.llvm.Core.LLVMSetOrdering;
 import static com.v7878.llvm.ObjectFile.LLVMCreateObjectFile;
 import static com.v7878.misc.Math.convEndian;
+import static com.v7878.misc.Math.d2l;
+import static com.v7878.misc.Math.f2i;
+import static com.v7878.misc.Math.i2f;
+import static com.v7878.misc.Math.l2d;
 import static com.v7878.unsafe.AndroidUnsafe.ARRAY_BOOLEAN_INDEX_SCALE;
 import static com.v7878.unsafe.AndroidUnsafe.ARRAY_BYTE_INDEX_SCALE;
 import static com.v7878.unsafe.AndroidUnsafe.ARRAY_CHAR_INDEX_SCALE;
@@ -41,10 +45,6 @@
 import static com.v7878.unsafe.AndroidUnsafe.ARRAY_INT_INDEX_SCALE;
 import static com.v7878.unsafe.AndroidUnsafe.ARRAY_LONG_INDEX_SCALE;
 import static com.v7878.unsafe.AndroidUnsafe.ARRAY_SHORT_INDEX_SCALE;
-import static com.v7878.unsafe.Utils.d2l;
-import static com.v7878.unsafe.Utils.f2i;
-import static com.v7878.unsafe.Utils.i2f;
-import static com.v7878.unsafe.Utils.l2d;
 import static com.v7878.unsafe.Utils.shouldNotHappen;
 import static com.v7878.unsafe.foreign.BulkLinker.CallType.CRITICAL;
 import static com.v7878.unsafe.foreign.BulkLinker.MapType.BOOL;