File tree Expand file tree Collapse file tree 1 file changed +8
-0
lines changed
source/ports/scala_port/src/main/scala Expand file tree Collapse file tree 1 file changed +8
-0
lines changed Original file line number Diff line number Diff line change @@ -2,7 +2,11 @@ package metacall
22
33import metacall .util ._
44import com .sun .jna ._
5+ <<<<<<< HEAD
56import cats .implicits ._
7+ =======
8+ import cats ._ , cats .implicits ._ , cats .effect ._
9+ >>>>>>> Solving some Scala port bugs and trying to implement support for multiple arguments.
610
711/** Create a [[Ptr ]] to MetaCall value of type [[A ]] */
812trait Create [A ] {
@@ -61,10 +65,14 @@ object Ptr {
6165 Create [FunctionPointer ].create {
6266 new FunctionPointer {
6367 def callback (argc : SizeT , args : Pointer , data : Pointer ): Pointer = {
68+ <<<<<<< HEAD
6469 val argsList = args
6570 .getPointerArray(0 , argc.intValue())
6671 .map(ptr => Ptr .toValue(Ptr .fromPrimitiveUnsafe(ptr)))
6772 .toList
73+ =======
74+ val argsList = args.getPointerArray(0 ).map(ptr => Ptr .toValue(Ptr .fromPrimitiveUnsafe(ptr))).toList
75+ >>>>>>> Solving some Scala port bugs and trying to implement support for multiple arguments.
6876
6977 Ptr .fromValueUnsafe(fn(argsList)).ptr
7078 }
You can’t perform that action at this time.
0 commit comments