Skip to content
This repository was archived by the owner on Feb 20, 2019. It is now read-only.

Experiment to compile to 2.12 and cross to 2.11, drop 2.10. #451

Open
wants to merge 5 commits into
base: 0.11.x
Choose a base branch
from
Open

Experiment to compile to 2.12 and cross to 2.11, drop 2.10. #451

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3a10228
Experiment to compile to 2.12 and maybe cross to 2.11, drop 2.10.
ekrich Mar 24, 2017
fc7b106
Replaced references to scala.concurrent.util.Unsafe
ekrich Mar 24, 2017
26ff07b
Correct spelling of pickling package in quasiquote. Bump sbt version …
ekrich Apr 25, 2017
021e332
Update travis
ekrich Jun 6, 2017
0a8942d
Only build again jdk8
ekrich Jun 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Replaced references to scala.concurrent.util.Unsafe
  • Loading branch information
@ekrich
ekrich committed Mar 24, 2017
commit fc7b1066e6b473e75309728b9b4ed41639856eb6
1 change: 0 additions & 1 deletion core/src/main/scala/scala/pickling/binary/Util.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package scala.pickling.binary
object UnsafeMemory {
import sun.misc.Unsafe
import scala.pickling.Tools
//private[pickling] val unsafe: Unsafe = scala.concurrent.util.Unsafe.instance
private[pickling] val unsafe: Unsafe = Tools.unsafe
private[pickling] val byteArrayOffset: Long = unsafe.arrayBaseOffset(classOf[Array[Byte]])
private[pickling] val shortArrayOffset: Long = unsafe.arrayBaseOffset(classOf[Array[Short]])
Expand Down
4 changes: 2 additions & 2 deletions core/src/main/scala/scala/pickling/generator/sourcegen.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,7 @@ private[pickling] trait SourceGenerator extends Macro with tags.FastTypeTagMacro

def genAllocateInstance(x: AllocateInstance): c.Tree = {
val tpe = x.tpe.tpe[c.universe.type](c.universe)
q"""_root_.scala.concurrent.util.Unsafe.instance.allocateInstance(classOf[$tpe]).asInstanceOf[$tpe]"""
q"""_root_.scala.picking.Tools.unsafe.allocateInstance(classOf[$tpe]).asInstanceOf[$tpe]"""
}

def generateUnpickleImplFromAst(unpicklerAst: UnpicklerAst): c.Tree = {
Expand Down Expand Up @@ -484,7 +484,7 @@ private[pickling] trait SourceGenerator extends Macro with tags.FastTypeTagMacro
val objectOutTpe = typeOf[scala.pickling.util.GenObjectOutput]
val fieldName = "$ext"
q"""
val $target = _root_.scala.concurrent.util.Unsafe.instance.allocateInstance(classOf[$tpe]).asInstanceOf[$tpe]
val $target = _root_.scala.picking.Tools.unsafe.allocateInstance(classOf[$tpe]).asInstanceOf[$tpe]
val $readerName = reader.readField($fieldName)
val out = {
val up = _root_.scala.Predef.implicitly[_root_.scala.pickling.Unpickler[$objectOutTpe]]
Expand Down