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 12:48:57 UTC
[03/16] ignite git commit: IGNITE-1364: Minor renames.
IGNITE-1364: Minor renames.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/41cd8240
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/41cd8240
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/41cd8240
Branch: refs/heads/ignite-1364
Commit: 41cd8240d33a7e1d92faefa28c0df9ca9288f1cc
Parents: 843fc30
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 13:25:38 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 13:25:38 2015 +0300
----------------------------------------------------------------------
modules/platform/src/main/cpp/core-test/src/cache_query_test.cpp | 2 +-
modules/platform/src/main/cpp/core-test/src/cache_test.cpp | 2 +-
.../platform/src/main/cpp/core-test/src/grid_factory_test.cpp | 2 +-
.../src/main/cpp/core/os/win/include/gridgain/impl/utils.h | 4 ++--
modules/platform/src/main/cpp/core/os/win/src/impl/utils.cpp | 4 ++--
5 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/41cd8240/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 2cae873..266ff19 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
@@ -195,7 +195,7 @@ struct CacheQueryTestSuiteFixture {
cfg.jvmInitMem = 1024;
cfg.jvmMaxMem = 4096;
- char* cfgPath = getenv("GRIDGAIN_NATIVE_TEST_CPP_CONFIG_PATH");
+ char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH");
std::string cfgPathStr = std::string(cfgPath).append("/").append("cache-query.xml");
http://git-wip-us.apache.org/repos/asf/ignite/blob/41cd8240/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 7b62fd6..1682055 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
@@ -101,7 +101,7 @@ struct CacheTestSuiteFixture {
cfg.jvmInitMem = 1024;
cfg.jvmMaxMem = 4096;
- char* cfgPath = getenv("GRIDGAIN_NATIVE_TEST_CPP_CONFIG_PATH");
+ char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH");
std::string cfgPathStr = std::string(cfgPath).append("/").append("cache-test.xml");
http://git-wip-us.apache.org/repos/asf/ignite/blob/41cd8240/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp b/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp
index be6ed63..fc33fb3 100644
--- a/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/grid_factory_test.cpp
@@ -39,7 +39,7 @@ BOOST_AUTO_TEST_CASE(TestGridFactory)
cfg.jvmInitMem = 1024;
cfg.jvmMaxMem = 4096;
- char* cfgPath = getenv("GRIDGAIN_NATIVE_TEST_CPP_CONFIG_PATH");
+ char* cfgPath = getenv("IGNITE_NATIVE_TEST_CPP_CONFIG_PATH");
std::string cfgPathStr = std::string(cfgPath).append("/").append("cache-test.xml");
http://git-wip-us.apache.org/repos/asf/ignite/blob/41cd8240/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h b/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h
index 2380930..3d72ae7 100644
--- a/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h
+++ b/modules/platform/src/main/cpp/core/os/win/include/gridgain/impl/utils.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef GRIDGAIN_UTILS
-#define GRIDGAIN_UTILS
+#ifndef _IGNITE_UTILS
+#define _IGNITE_UTILS
#include <cstring>
#include <string>
http://git-wip-us.apache.org/repos/asf/ignite/blob/41cd8240/modules/platform/src/main/cpp/core/os/win/src/impl/utils.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/os/win/src/impl/utils.cpp b/modules/platform/src/main/cpp/core/os/win/src/impl/utils.cpp
index 16a1451..ee418ad 100644
--- a/modules/platform/src/main/cpp/core/os/win/src/impl/utils.cpp
+++ b/modules/platform/src/main/cpp/core/os/win/src/impl/utils.cpp
@@ -33,7 +33,7 @@ namespace ignite
const char* PROBE_BIN = "\\bin";
const char* PROBE_EXAMPLES = "\\examples";
- const char* GRIDGAIN_NATIVE_TEST_CLASSPATH = "GRIDGAIN_NATIVE_TEST_CLASSPATH";
+ const char* IGNITE_NATIVE_TEST_CLASSPATH = "IGNITE_NATIVE_TEST_CLASSPATH";
/**
* Helper method to set boolean result to reference with proper NULL-check.
@@ -424,7 +424,7 @@ namespace ignite
if (home)
{
bool envFound;
- std::string env = GetEnv(GRIDGAIN_NATIVE_TEST_CLASSPATH, &envFound);
+ std::string env = GetEnv(IGNITE_NATIVE_TEST_CLASSPATH, &envFound);
forceTest = envFound && env.compare("true") == 0;
}