MInors.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/fb463162 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/fb463162 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/fb463162 Branch: refs/heads/ignite-1093-2 Commit: fb4631624f7fd124f63887bd6727f55ecda3988e Parents: 8b214d5 Author: vozerov-gridgain <[email protected]> Authored: Mon Sep 7 16:30:26 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Mon Sep 7 16:30:26 2015 +0300 ---------------------------------------------------------------------- .../src/main/cpp/common/project/vs/common.vcxproj | 10 +++++----- modules/platform/src/main/cpp/common/src/java.cpp | 2 +- .../Apache.Ignite.Core/Impl/Memory/PlatformMemoryUtils.cs | 1 + .../Impl/Portable/Io/PortableAbstractStream.cs | 1 - 4 files changed, 7 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/fb463162/modules/platform/src/main/cpp/common/project/vs/common.vcxproj ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/common/project/vs/common.vcxproj b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj index 478932f..ddc0019 100644 --- a/modules/platform/src/main/cpp/common/project/vs/common.vcxproj +++ b/modules/platform/src/main/cpp/common/project/vs/common.vcxproj @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> +<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";> <ItemGroup Label="ProjectConfigurations"> <ProjectConfiguration Include="Debug|Win32"> <Configuration>Debug</Configuration> @@ -27,26 +27,26 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v100</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>true</UseDebugLibraries> - <PlatformToolset>v100</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v100</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration"> <ConfigurationType>DynamicLibrary</ConfigurationType> <UseDebugLibraries>false</UseDebugLibraries> - <PlatformToolset>v100</PlatformToolset> + <PlatformToolset>v120</PlatformToolset> <WholeProgramOptimization>true</WholeProgramOptimization> <CharacterSet>Unicode</CharacterSet> </PropertyGroup> http://git-wip-us.apache.org/repos/asf/ignite/blob/fb463162/modules/platform/src/main/cpp/common/src/java.cpp ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/cpp/common/src/java.cpp b/modules/platform/src/main/cpp/common/src/java.cpp index 5c5911a..bb4cc20 100644 --- a/modules/platform/src/main/cpp/common/src/java.cpp +++ b/modules/platform/src/main/cpp/common/src/java.cpp @@ -2060,7 +2060,7 @@ namespace ignite JNIEXPORT void JNICALL JniComputeJobDestroy(JNIEnv *env, jclass cls, jlong envPtr, jlong jobPtr) { IGNITE_SAFE_PROC(env, envPtr, ComputeJobDestroyHandler, computeJobDestroy, jobPtr); } - + JNIEXPORT void JNICALL JniContinuousQueryListenerApply(JNIEnv *env, jclass cls, jlong envPtr, jlong cbPtr, jlong memPtr) { IGNITE_SAFE_PROC(env, envPtr, ContinuousQueryListenerApplyHandler, contQryLsnrApply, cbPtr, memPtr); } http://git-wip-us.apache.org/repos/asf/ignite/blob/fb463162/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryUtils.cs ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryUtils.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryUtils.cs index 2b0277a..dd53281 100644 --- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryUtils.cs +++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Memory/PlatformMemoryUtils.cs @@ -25,6 +25,7 @@ namespace Apache.Ignite.Core.Impl.Memory /// <summary> /// Utility methods for platform memory management. /// </summary> + [CLSCompliant(false)] public static unsafe class PlatformMemoryUtils { #region CONSTANTS http://git-wip-us.apache.org/repos/asf/ignite/blob/fb463162/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Portable/Io/PortableAbstractStream.cs ---------------------------------------------------------------------- diff --git a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Portable/Io/PortableAbstractStream.cs b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Portable/Io/PortableAbstractStream.cs index 38a19ab..648d754 100644 --- a/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Portable/Io/PortableAbstractStream.cs +++ b/modules/platform/src/main/dotnet/Apache.Ignite.Core/Impl/Portable/Io/PortableAbstractStream.cs @@ -26,7 +26,6 @@ namespace Apache.Ignite.Core.Impl.Portable.IO /// <summary> /// Base class for managed and unmanaged data streams. /// </summary> - [CLSCompliant(false)] internal unsafe abstract class PortableAbstractStream : IPortableStream { /// <summary>
