From 642f97a9378f71a279b22aa4af12f12e7f52c149 Mon Sep 17 00:00:00 2001
From: Jakob Odersky <jodersky@gmail.com>
Date: Mon, 29 Jun 2015 12:43:56 +0200
Subject: fix warnings

---
 build.sbt                                               | 2 ++
 src/main/scala/sims/collision/Pair.scala                | 2 ++
 src/main/scala/sims/collision/PolyCircleCollision.scala | 4 ++--
 src/main/scala/sims/util/Positioning.scala              | 2 ++
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/build.sbt b/build.sbt
index 24c097a..2bd320c 100644
--- a/build.sbt
+++ b/build.sbt
@@ -4,6 +4,8 @@ version := "1.1"
 
 scalaVersion := "2.11.7"
 
+scalacOptions ++= Seq("-deprecation", "-feature")
+
 libraryDependencies ++= Seq(
   "org.scala-lang.modules" %% "scala-swing" % "2.0.0-M2",
   "com.typesafe.akka" %% "akka-actor" % "2.3.11"
diff --git a/src/main/scala/sims/collision/Pair.scala b/src/main/scala/sims/collision/Pair.scala
index a01fb00..02880dc 100644
--- a/src/main/scala/sims/collision/Pair.scala
+++ b/src/main/scala/sims/collision/Pair.scala
@@ -6,6 +6,8 @@
 
 package sims.collision
 
+import scala.language.implicitConversions
+
 import sims.dynamics._
 
 /**Pair of shapes.*/
diff --git a/src/main/scala/sims/collision/PolyCircleCollision.scala b/src/main/scala/sims/collision/PolyCircleCollision.scala
index 20f1d49..3048ef3 100644
--- a/src/main/scala/sims/collision/PolyCircleCollision.scala
+++ b/src/main/scala/sims/collision/PolyCircleCollision.scala
@@ -19,11 +19,11 @@ case class PolyCircleCollision(p: ConvexPolygon, c: Circle) extends Collision {
     //minimum overlap
     var min = (p.sides(0) distance c.pos) - c.radius
     var axis = p.sides(0).n0
-    for (s <- p.sides; val delta = (s distance c.pos) - c.radius) if (delta <= 0 && delta < min) {
+    for (s <- p.sides; delta = (s distance c.pos) - c.radius) if (delta <= 0 && delta < min) {
       min = delta
       axis = s.n0
     }
-    for (v <- p.vertices; val delta = (v - c.pos).length - c.radius) if (delta <= 0 && delta <= min){
+    for (v <- p.vertices; delta = (v - c.pos).length - c.radius) if (delta <= 0 && delta <= min){
       min = delta
       axis = (c.pos - v).unit
     }
diff --git a/src/main/scala/sims/util/Positioning.scala b/src/main/scala/sims/util/Positioning.scala
index cf72276..84441de 100644
--- a/src/main/scala/sims/util/Positioning.scala
+++ b/src/main/scala/sims/util/Positioning.scala
@@ -6,6 +6,8 @@
 
 package sims.util
 
+import scala.language.implicitConversions
+
 import sims.geometry._
 import sims.dynamics._
 
-- 
cgit v1.2.3