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:10:33 UTC
[6/7] ignite git commit: IGNITE-1364: Renaming GG_ -> IGNITE_ (3)
IGNITE-1364: Renaming GG_ -> IGNITE_ (3)
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/664a1050
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/664a1050
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/664a1050
Branch: refs/heads/ignite-1364
Commit: 664a1050e454d083443b5973955ec6f94f69d200
Parents: 96245bf
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 13:08:38 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 13:08:38 2015 +0300
----------------------------------------------------------------------
.../cpp/core-test/project/vs/core-test.vcxproj | 8 +++---
.../core/os/linux/include/gridgain/impl/utils.h | 26 ++++++++++----------
.../core/os/win/include/gridgain/impl/utils.h | 26 ++++++++++----------
.../src/main/cpp/core/project/vs/core.vcxproj | 8 +++---
.../main/cpp/core/project/vs/core.vcxprojrel | 8 +++---
5 files changed, 38 insertions(+), 38 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj
index cc7704f..52def17 100644
--- a/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj
+++ b/modules/platform/src/main/cpp/core-test/project/vs/core-test.vcxproj
@@ -109,7 +109,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;GG_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;_CRTDBG_MAP_ALLOC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
<Link>
@@ -124,7 +124,7 @@
<Optimization>Disabled</Optimization>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;GG_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_DEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
<Link>
@@ -140,7 +140,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;GG_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
<Link>
@@ -158,7 +158,7 @@
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
<AdditionalIncludeDirectories>$(JAVA_HOME)\include;$(JAVA_HOME)\include\win32;$(ProjectDir)\..\..\..\common\include;$(ProjectDir)\..\..\..\common\os\win\include;$(ProjectDir)\..\..\..\core\include;$(ProjectDir)\..\..\..\core\os\win\include;$(ProjectDir)\..\..\include;$(BOOST_HOME)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;GG_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>NDEBUG;IGNITE_IMPL;BOOST_DATE_TIME_NO_LIB;BOOST_REGEX_NO_LIB;_CRT_SECURE_NO_WARNINGS;IGNITE_FRIEND;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ExceptionHandling>Async</ExceptionHandling>
</ClCompile>
<Link>
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h b/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h
index c87b345..5cbd6cf 100644
--- a/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h
+++ b/modules/platform/src/main/cpp/core/os/linux/include/gridgain/impl/utils.h
@@ -23,10 +23,10 @@
#include <ignite/common/common.h>
-#ifdef GG_FRIEND
- #define GG_FRIEND_EXPORT IGNITE_EXPORT
+#ifdef IGNITE_FRIEND
+ #define IGNITE_FRIEND_EXPORT IGNITE_EXPORT
#else
- #define GG_FRIEND_EXPORT
+ #define IGNITE_FRIEND_EXPORT
#endif
namespace gridgain
@@ -41,14 +41,14 @@ namespace gridgain
* @param val Value.
* @return Result.
*/
- GG_FRIEND_EXPORT char* CopyChars(const char* val);
+ IGNITE_FRIEND_EXPORT char* CopyChars(const char* val);
/**
* Release characters.
*
* @param val Value.
*/
- GG_FRIEND_EXPORT void ReleaseChars(char* val);
+ IGNITE_FRIEND_EXPORT void ReleaseChars(char* val);
/**
* Read system environment variable taking thread-safety in count.
@@ -57,7 +57,7 @@ namespace gridgain
* @param found Whether environment variable with such name was found.
* @return Environment variable value.
*/
- GG_FRIEND_EXPORT std::string GetEnv(const std::string& name, bool* found);
+ IGNITE_FRIEND_EXPORT std::string GetEnv(const std::string& name, bool* found);
/**
* Ensure that file on the given path exists in the system.
@@ -65,7 +65,7 @@ namespace gridgain
* @param path Path.
* @return True if file exists, false otherwise.
*/
- GG_FRIEND_EXPORT bool FileExists(const std::string& path);
+ IGNITE_FRIEND_EXPORT bool FileExists(const std::string& path);
/**
* Attempts to find JVM library to load it into the process later.
@@ -76,7 +76,7 @@ namespace gridgain
* @param found Whether library was found.
* @return Path to the file.
*/
- GG_FRIEND_EXPORT std::string FindJvmLibrary(const std::string* path, bool* found);
+ IGNITE_FRIEND_EXPORT std::string FindJvmLibrary(const std::string* path, bool* found);
/**
* Load JVM library into the process.
@@ -84,7 +84,7 @@ namespace gridgain
* @param path Optional path to the library.
* @return Whether load was successful.
*/
- GG_FRIEND_EXPORT bool LoadJvmLibrary(const std::string& path);
+ IGNITE_FRIEND_EXPORT bool LoadJvmLibrary(const std::string& path);
/**
* Resolve GRIDGAIN_HOME directory. Resolution is performed in several
@@ -100,7 +100,7 @@ namespace gridgain
* @param found Whether GRIDGAIN_HOME home was found.
* @return Resolved GG home.
*/
- GG_FRIEND_EXPORT std::string ResolveGridGainHome(const std::string* path, bool* found);
+ IGNITE_FRIEND_EXPORT std::string ResolveGridGainHome(const std::string* path, bool* found);
/**
* Create GridGain classpath based on user input and home directory.
@@ -109,7 +109,7 @@ namespace gridgain
* @param home GridGain home directory.
* @return Classpath.
*/
- GG_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home);
+ IGNITE_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home);
/**
* Create GridGain classpath based on user input and home directory.
@@ -119,13 +119,13 @@ namespace gridgain
* @param test Whether test classpath must be used.
* @return Classpath.
*/
- GG_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home, bool test);
+ IGNITE_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home, bool test);
/**
* Safe array which automatically reclaims occupied memory when out of scope.
*/
template<typename T>
- struct GG_FRIEND_EXPORT SafeArray
+ struct IGNITE_FRIEND_EXPORT SafeArray
{
/**
* Constructor.
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/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 d261f8a..3ad40b7 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
@@ -23,10 +23,10 @@
#include <ignite/common/common.h>
-#ifdef GG_FRIEND
- #define GG_FRIEND_EXPORT IGNITE_EXPORT
+#ifdef IGNITE_FRIEND
+ #define IGNITE_FRIEND_EXPORT IGNITE_EXPORT
#else
- #define GG_FRIEND_EXPORT
+ #define IGNITE_FRIEND_EXPORT
#endif
namespace gridgain
@@ -41,14 +41,14 @@ namespace gridgain
* @param val Value.
* @return Result.
*/
- GG_FRIEND_EXPORT char* CopyChars(const char* val);
+ IGNITE_FRIEND_EXPORT char* CopyChars(const char* val);
/**
* Release characters.
*
* @param val Value.
*/
- GG_FRIEND_EXPORT void ReleaseChars(char* val);
+ IGNITE_FRIEND_EXPORT void ReleaseChars(char* val);
/**
* Read system environment variable taking thread-safety in count.
@@ -57,7 +57,7 @@ namespace gridgain
* @param found Whether environment variable with such name was found.
* @return Environment variable value.
*/
- GG_FRIEND_EXPORT std::string GetEnv(const std::string& name, bool* found);
+ IGNITE_FRIEND_EXPORT std::string GetEnv(const std::string& name, bool* found);
/**
* Ensure that file on the given path exists in the system.
@@ -65,7 +65,7 @@ namespace gridgain
* @param path Path.
* @return True if file exists, false otherwise.
*/
- GG_FRIEND_EXPORT bool FileExists(const std::string& path);
+ IGNITE_FRIEND_EXPORT bool FileExists(const std::string& path);
/**
* Attempts to find JVM library to load it into the process later.
@@ -76,7 +76,7 @@ namespace gridgain
* @param found Whether library was found.
* @return Path to the file.
*/
- GG_FRIEND_EXPORT std::string FindJvmLibrary(const std::string* path, bool* found);
+ IGNITE_FRIEND_EXPORT std::string FindJvmLibrary(const std::string* path, bool* found);
/**
* Load JVM library into the process.
@@ -84,7 +84,7 @@ namespace gridgain
* @param path Optional path to the library.
* @return Whether load was successful.
*/
- GG_FRIEND_EXPORT bool LoadJvmLibrary(const std::string& path);
+ IGNITE_FRIEND_EXPORT bool LoadJvmLibrary(const std::string& path);
/**
* Resolve GRIDGAIN_HOME directory. Resolution is performed in several
@@ -100,7 +100,7 @@ namespace gridgain
* @param found Whether GRIDGAIN_HOME home was found.
* @return Resolved GG home.
*/
- GG_FRIEND_EXPORT std::string ResolveGridGainHome(const std::string* path, bool* found);
+ IGNITE_FRIEND_EXPORT std::string ResolveGridGainHome(const std::string* path, bool* found);
/**
* Create GridGain classpath based on user input and home directory.
@@ -109,7 +109,7 @@ namespace gridgain
* @param home GridGain home directory.
* @return Classpath.
*/
- GG_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home);
+ IGNITE_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home);
/**
* Create GridGain classpath based on user input and home directory.
@@ -119,13 +119,13 @@ namespace gridgain
* @param test Whether test classpath must be used.
* @return Classpath.
*/
- GG_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home, bool test);
+ IGNITE_FRIEND_EXPORT std::string CreateGridGainClasspath(const std::string* usrCp, const std::string* home, bool test);
/**
* Safe array which automatically reclaims occupied memory when out of scope.
*/
template<typename T>
- struct GG_FRIEND_EXPORT SafeArray
+ struct IGNITE_FRIEND_EXPORT SafeArray
{
/** Target array. */
T* target;
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/modules/platform/src/main/cpp/core/project/vs/core.vcxproj
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/project/vs/core.vcxproj b/modules/platform/src/main/cpp/core/project/vs/core.vcxproj
index 4f9bfaf..78eb949 100644
--- a/modules/platform/src/main/cpp/core/project/vs/core.vcxproj
+++ b/modules/platform/src/main/cpp/core/project/vs/core.vcxproj
@@ -99,7 +99,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -127,7 +127,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -153,7 +153,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -177,7 +177,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
http://git-wip-us.apache.org/repos/asf/ignite/blob/664a1050/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel b/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel
index 4f9bfaf..78eb949 100644
--- a/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel
+++ b/modules/platform/src/main/cpp/core/project/vs/core.vcxprojrel
@@ -99,7 +99,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -127,7 +127,7 @@
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
<FunctionLevelLinking>true</FunctionLevelLinking>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<WholeProgramOptimization>false</WholeProgramOptimization>
</ClCompile>
<Link>
@@ -153,7 +153,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -177,7 +177,7 @@
<StringPooling>true</StringPooling>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<BufferSecurityCheck>false</BufferSecurityCheck>
- <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;GG_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;IGNITE_IMPL;IGNITE_FRIEND;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>