From 99a7e38e79e1f1bd4a01f37eaa9ea08ae7a9d433 Mon Sep 17 00:00:00 2001 From: Reino Ruusu Date: Wed, 1 Feb 2017 18:02:35 +0200 Subject: [PATCH] Fixed merge errors. Change-Id: Ia2c8157c0f81c7b77033a5a2477a4671fcb3ac3f --- .../jnipython.dll | Bin 35328 -> 35328 bytes .../src/sclpy.c | 14 ++++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/org.simantics.pythonlink.win32.x86_64/jnipython.dll b/org.simantics.pythonlink.win32.x86_64/jnipython.dll index 44ca25da907bb65226e81e87ad169b88cd10dcdf..e5339466a7dc2c6854d07f4d9b6f02b02425d111 100644 GIT binary patch delta 5734 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, statement, NULL); PyEval_RestoreThread(main_ts); PyErr_Clear(); { + PyObject *module = getModule(contextID); + jclass sclReportingWriterClass = (*env)->FindClass(env, SCL_REPORTING_WRITER_CLASS); jmethodID constructor = (*env)->GetMethodID(env, sclReportingWriterClass, "", "()V"); jmethodID flushMethod = (*env)->GetMethodID(env, sclReportingWriterClass, "flush", "()V"); -- 2.47.1