diff options
3 files changed, 5 insertions, 5 deletions
diff --git a/opendc-kernel-omega/src/main/kotlin/com/atlarge/opendc/omega/OmegaKernel.kt b/opendc-kernel-omega/src/main/kotlin/com/atlarge/opendc/omega/OmegaKernel.kt index e0d70eed..c0ab9fb4 100644 --- a/opendc-kernel-omega/src/main/kotlin/com/atlarge/opendc/omega/OmegaKernel.kt +++ b/opendc-kernel-omega/src/main/kotlin/com/atlarge/opendc/omega/OmegaKernel.kt @@ -25,8 +25,8 @@ package com.atlarge.opendc.omega import com.atlarge.opendc.simulator.Bootstrap -import com.atlarge.opendc.simulator.kernel.Simulation import com.atlarge.opendc.simulator.kernel.Kernel +import com.atlarge.opendc.simulator.kernel.Simulation /** * The Omega simulation kernel is the reference simulation kernel implementation for the OpenDC Simulator core. diff --git a/opendc-model-odc/jpa/src/main/resources/jpa/schema.xml b/opendc-model-odc/jpa/src/main/resources/jpa/schema.xml index 142c3ee8..887cc8ab 100644 --- a/opendc-model-odc/jpa/src/main/resources/jpa/schema.xml +++ b/opendc-model-odc/jpa/src/main/resources/jpa/schema.xml @@ -22,9 +22,9 @@ ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ~ SOFTWARE. --> -<entity-mappings xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - version="2.1" - xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm" +<entity-mappings + version="2.1" + xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm" > <package>com.atlarge.opendc.model.odc.integration.jpa.schema</package> diff --git a/opendc-stdlib/src/main/kotlin/com/atlarge/opendc/simulator/Helpers.kt b/opendc-stdlib/src/main/kotlin/com/atlarge/opendc/simulator/Helpers.kt index acf3fe41..0f6392ed 100644 --- a/opendc-stdlib/src/main/kotlin/com/atlarge/opendc/simulator/Helpers.kt +++ b/opendc-stdlib/src/main/kotlin/com/atlarge/opendc/simulator/Helpers.kt @@ -1,6 +1,6 @@ package com.atlarge.opendc.simulator -import kotlin.coroutines.experimental.intrinsics.* +import kotlin.coroutines.experimental.intrinsics.suspendCoroutineOrReturn /** * Try to find the [Context] instance associated with the [Process] in the call chain which has (indirectly) invoked the |