You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2015/09/03 14:21:00 UTC
ignite git commit: IGNITE-1364: GridJvmOption -> IgniteJvmOption.
Repository: ignite
Updated Branches:
refs/heads/ignite-1364 8c86870c0 -> 9691415af
IGNITE-1364: GridJvmOption -> IgniteJvmOption.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9691415a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9691415a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9691415a
Branch: refs/heads/ignite-1364
Commit: 9691415afa23812f68f1b07d0c6242534e0802a0
Parents: 8c86870
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 15:21:38 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 15:21:38 2015 +0300
----------------------------------------------------------------------
.../main/cpp/core-test/src/cache_query_test.cpp | 12 +++++------
.../src/main/cpp/core-test/src/cache_test.cpp | 12 +++++------
.../main/cpp/core-test/src/ignition_test.cpp | 12 +++++------
.../core/include/ignite/ignite_configuration.h | 8 +++----
.../platform/src/main/cpp/project/vs/ignite.sln | 22 +++++++++++---------
5 files changed, 34 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9691415a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp b/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp
index fb86d4e..5bc1d61 100644
--- a/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp
@@ -188,13 +188,13 @@ struct CacheQueryTestSuiteFixture {
{
IgniteConfiguration cfg;
- GridJvmOption opts[5];
+ IgniteJvmOption opts[5];
- opts[0] = GridJvmOption("-Xdebug");
- opts[1] = GridJvmOption("-Xnoagent");
- opts[2] = GridJvmOption("-Djava.compiler=NONE");
- opts[3] = GridJvmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005");
- opts[4] = GridJvmOption("-XX:+HeapDumpOnOutOfMemoryError");
+ opts[0] = IgniteJvmOption("-Xdebug");
+ opts[1] = IgniteJvmOption("-Xnoagent");
+ opts[2] = IgniteJvmOption("-Djava.compiler=NONE");
+ opts[3] = IgniteJvmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005");
+ opts[4] = IgniteJvmOption("-XX:+HeapDumpOnOutOfMemoryError");
cfg.jvmOptsLen = 5;
cfg.jvmOpts = opts;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9691415a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp b/modules/platform/src/main/cpp/core-test/src/cache_test.cpp
index f63f886..43681ae 100644
--- a/modules/platform/src/main/cpp/core-test/src/cache_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/cache_test.cpp
@@ -95,13 +95,13 @@ struct CacheTestSuiteFixture {
{
IgniteConfiguration cfg;
- GridJvmOption opts[5];
+ IgniteJvmOption opts[5];
- opts[0] = GridJvmOption("-Xdebug");
- opts[1] = GridJvmOption("-Xnoagent");
- opts[2] = GridJvmOption("-Djava.compiler=NONE");
- opts[3] = GridJvmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005");
- opts[4] = GridJvmOption("-XX:+HeapDumpOnOutOfMemoryError");
+ opts[0] = IgniteJvmOption("-Xdebug");
+ opts[1] = IgniteJvmOption("-Xnoagent");
+ opts[2] = IgniteJvmOption("-Djava.compiler=NONE");
+ opts[3] = IgniteJvmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005");
+ opts[4] = IgniteJvmOption("-XX:+HeapDumpOnOutOfMemoryError");
cfg.jvmOptsLen = 5;
cfg.jvmOpts = opts;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9691415a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp b/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp
index ee6ccad..ee7c581 100644
--- a/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/ignition_test.cpp
@@ -33,13 +33,13 @@ BOOST_AUTO_TEST_CASE(TestIgnition)
{
IgniteConfiguration cfg;
- GridJvmOption opts[5];
+ IgniteJvmOption opts[5];
- opts[0] = GridJvmOption("-Xdebug");
- opts[1] = GridJvmOption("-Xnoagent");
- opts[2] = GridJvmOption("-Djava.compiler=NONE");
- opts[3] = GridJvmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005");
- opts[4] = GridJvmOption("-XX:+HeapDumpOnOutOfMemoryError");
+ opts[0] = IgniteJvmOption("-Xdebug");
+ opts[1] = IgniteJvmOption("-Xnoagent");
+ opts[2] = IgniteJvmOption("-Djava.compiler=NONE");
+ opts[3] = IgniteJvmOption("-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=5005");
+ opts[4] = IgniteJvmOption("-XX:+HeapDumpOnOutOfMemoryError");
cfg.jvmOptsLen = 5;
cfg.jvmOpts = opts;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9691415a/modules/platform/src/main/cpp/core/include/ignite/ignite_configuration.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/ignite/ignite_configuration.h b/modules/platform/src/main/cpp/core/include/ignite/ignite_configuration.h
index e7dadda..f13f59a 100644
--- a/modules/platform/src/main/cpp/core/include/ignite/ignite_configuration.h
+++ b/modules/platform/src/main/cpp/core/include/ignite/ignite_configuration.h
@@ -25,7 +25,7 @@ namespace ignite
/**
* Single JVM option.
*/
- struct GridJvmOption
+ struct IgniteJvmOption
{
/** Option. */
char* opt;
@@ -33,7 +33,7 @@ namespace ignite
/**
* Default constructor.
*/
- GridJvmOption() : opt(NULL)
+ IgniteJvmOption() : opt(NULL)
{
// No-op.
}
@@ -43,7 +43,7 @@ namespace ignite
*
* @param opt Option.
*/
- GridJvmOption(char* opt) : opt(opt)
+ IgniteJvmOption(char* opt) : opt(opt)
{
// No-op.
}
@@ -73,7 +73,7 @@ namespace ignite
int32_t jvmMaxMem;
/** Additional JVM options. */
- GridJvmOption* jvmOpts;
+ IgniteJvmOption* jvmOpts;
/** Additional JVM options count. */
int32_t jvmOptsLen;
http://git-wip-us.apache.org/repos/asf/ignite/blob/9691415a/modules/platform/src/main/cpp/project/vs/ignite.sln
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/project/vs/ignite.sln b/modules/platform/src/main/cpp/project/vs/ignite.sln
index 3d656bc..4a2ec29 100644
--- a/modules/platform/src/main/cpp/project/vs/ignite.sln
+++ b/modules/platform/src/main/cpp/project/vs/ignite.sln
@@ -1,6 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.31101.0
+MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "common", "..\..\common\project\vs\common.vcxproj", "{4F7E4917-4612-4B96-9838-025711ADE391}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "core", "..\..\core\project\vs\core.vcxproj", "{E2DEA693-F2EA-43C2-A813-053378F6E4DB}"
@@ -15,14 +17,6 @@ Global
Release|x64 = Release|x64
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.ActiveCfg = Debug|Win32
- {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.Build.0 = Debug|Win32
- {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.ActiveCfg = Debug|x64
- {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.Build.0 = Debug|x64
- {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.ActiveCfg = Release|Win32
- {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.Build.0 = Release|Win32
- {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.ActiveCfg = Release|x64
- {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.Build.0 = Release|x64
{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Win32.ActiveCfg = Debug|Win32
{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|Win32.Build.0 = Debug|Win32
{4F7E4917-4612-4B96-9838-025711ADE391}.Debug|x64.ActiveCfg = Debug|x64
@@ -31,6 +25,14 @@ Global
{4F7E4917-4612-4B96-9838-025711ADE391}.Release|Win32.Build.0 = Release|Win32
{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.ActiveCfg = Release|x64
{4F7E4917-4612-4B96-9838-025711ADE391}.Release|x64.Build.0 = Release|x64
+ {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.ActiveCfg = Debug|Win32
+ {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|Win32.Build.0 = Debug|Win32
+ {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.ActiveCfg = Debug|x64
+ {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Debug|x64.Build.0 = Debug|x64
+ {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.ActiveCfg = Release|Win32
+ {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|Win32.Build.0 = Release|Win32
+ {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.ActiveCfg = Release|x64
+ {E2DEA693-F2EA-43C2-A813-053378F6E4DB}.Release|x64.Build.0 = Release|x64
{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Debug|Win32.ActiveCfg = Debug|Win32
{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Debug|Win32.Build.0 = Debug|Win32
{133A22DB-FD60-44B9-B5E3-6CBB3EA5ABF0}.Debug|x64.ActiveCfg = Debug|x64