From 30d4e61bb657bc50a15c8d22245a698f84155c0c Mon Sep 17 00:00:00 2001 From: mlangkabel Date: Thu, 21 Dec 2017 12:42:37 +0100 Subject: [PATCH] src: windows compilation fixes * fixed msvc compiler error * updated required jar names --- src/lib/utility/messaging/MessageBase.h | 2 +- src/lib_java/utility/utilityJava.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/lib/utility/messaging/MessageBase.h b/src/lib/utility/messaging/MessageBase.h index 075fcef4..b12ef240 100644 --- a/src/lib/utility/messaging/MessageBase.h +++ b/src/lib/utility/messaging/MessageBase.h @@ -103,7 +103,7 @@ public: } private: - static size_t s_nextId; + static Id s_nextId; Id m_id; diff --git a/src/lib_java/utility/utilityJava.cpp b/src/lib_java/utility/utilityJava.cpp index 69c91ffe..3fa1d41f 100644 --- a/src/lib_java/utility/utilityJava.cpp +++ b/src/lib_java/utility/utilityJava.cpp @@ -9,14 +9,13 @@ namespace utility std::vector getRequiredJarNames() { std::vector jarNames = { - "gradle-tooling-api-4.2.jar", "java-indexer.jar", "org.eclipse.core.commands-3.9.0.jar", "org.eclipse.core.contenttype-3.6.0.jar", "org.eclipse.core.expressions-3.6.0.jar", "org.eclipse.core.filesystem-1.7.0.jar", - "org.eclipse.core.jobs-3.9.1.jar", + "org.eclipse.core.jobs-3.9.2.jar", "org.eclipse.core.resources-3.12.0.jar", "org.eclipse.core.runtime-3.13.0.jar", "org.eclipse.equinox.app-1.3.400.jar",