From 4ba448468380d7c1067eb523638f7b95a4ab91ad Mon Sep 17 00:00:00 2001
From: Zalim Bashorov <Zalim.Bashorov@jetbrains.com>
Date: Mon, 15 Sep 2014 22:43:05 +0400
Subject: [PATCH] Stdlib: moved setOf and linkedListOf from JUtilJVM.kt to
 JUtil.kt.

---
 libraries/stdlib/src/kotlin/collections/JUtil.kt    | 6 ++++++
 libraries/stdlib/src/kotlin/collections/JUtilJVM.kt | 6 ------
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libraries/stdlib/src/kotlin/collections/JUtil.kt b/libraries/stdlib/src/kotlin/collections/JUtil.kt
index fffda871414..f4f910b7f28 100644
--- a/libraries/stdlib/src/kotlin/collections/JUtil.kt
+++ b/libraries/stdlib/src/kotlin/collections/JUtil.kt
@@ -22,6 +22,12 @@ public fun mapOf<K, V>(vararg values: Pair<K, V>): Map<K, V> = if (values.size =
 /** Returns an empty read-only map */
 public fun mapOf<K, V>(): Map<K, V> = stdlib_emptyMap()
 
+/** Returns a new read-only set of given elements */
+public fun setOf<T>(vararg values: T): Set<T> = values.toCollection(LinkedHashSet<T>())
+
+/** Returns a new LinkedList with a variable number of initial elements */
+public fun linkedListOf<T>(vararg values: T): LinkedList<T> = values.toCollection(LinkedList<T>())
+
 /** Returns a new ArrayList with a variable number of initial elements */
 public fun arrayListOf<T>(vararg values: T): ArrayList<T> = values.toCollection(ArrayList(values.size))
 
diff --git a/libraries/stdlib/src/kotlin/collections/JUtilJVM.kt b/libraries/stdlib/src/kotlin/collections/JUtilJVM.kt
index b65e291e6c3..8245598c8d3 100644
--- a/libraries/stdlib/src/kotlin/collections/JUtilJVM.kt
+++ b/libraries/stdlib/src/kotlin/collections/JUtilJVM.kt
@@ -2,12 +2,6 @@ package kotlin
 
 import java.util.*
 
-/** Returns a new read-only set of given elements */
-public fun setOf<T>(vararg values: T): Set<T> = values.toCollection(LinkedHashSet<T>())
-
-/** Returns a new LinkedList with a variable number of initial elements */
-public fun linkedListOf<T>(vararg values: T): LinkedList<T> = values.toCollection(LinkedList<T>())
-
 /**
  * Returns a new [[SortedSet]] with the initial elements
  */