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:56 UTC
[02/16] ignite git commit: IGNITE-1364: Renamed namespaces.
IGNITE-1364: Renamed namespaces.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/843fc30b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/843fc30b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/843fc30b
Branch: refs/heads/ignite-1364
Commit: 843fc30b9ef719d4f6c7a0fd8d9242297fe0ec31
Parents: 356ab0b
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Thu Sep 3 13:21:41 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Thu Sep 3 13:21:41 2015 +0300
----------------------------------------------------------------------
.../include/gridgain/portable_test_defs.h | 6 ++--
.../include/gridgain/portable_test_utils.h | 8 ++---
.../main/cpp/core-test/src/cache_query_test.cpp | 10 +++---
.../src/main/cpp/core-test/src/cache_test.cpp | 4 +--
.../cpp/core-test/src/grid_factory_test.cpp | 2 +-
.../cpp/core-test/src/handle_registry_test.cpp | 2 +-
.../src/portable_reader_writer_raw_test.cpp | 10 +++---
.../src/portable_reader_writer_test.cpp | 10 +++---
.../cpp/core-test/src/portable_session_test.cpp | 10 +++---
.../cpp/core-test/src/portable_test_defs.cpp | 10 +++---
.../cpp/core/include/gridgain/cache/cache.h | 6 ++--
.../core/include/gridgain/cache/cache_entry.h | 2 +-
.../include/gridgain/cache/cache_peek_mode.h | 2 +-
.../gridgain/cache/query/query_argument.h | 6 ++--
.../include/gridgain/cache/query/query_cursor.h | 2 +-
.../include/gridgain/cache/query/query_scan.h | 2 +-
.../include/gridgain/cache/query/query_sql.h | 2 +-
.../include/gridgain/cache/query/query_text.h | 2 +-
.../src/main/cpp/core/include/gridgain/grid.h | 2 +-
.../core/include/gridgain/grid_configuration.h | 2 +-
.../main/cpp/core/include/gridgain/grid_error.h | 19 +++++-------
.../cpp/core/include/gridgain/grid_factory.h | 2 +-
.../src/main/cpp/core/include/gridgain/guid.h | 2 +-
.../include/gridgain/impl/cache/cache_impl.h | 10 +++---
.../gridgain/impl/cache/query/query_impl.h | 2 +-
.../include/gridgain/impl/grid_environment.h | 2 +-
.../cpp/core/include/gridgain/impl/grid_impl.h | 2 +-
.../include/gridgain/impl/handle_registry.h | 2 +-
.../impl/interop/interop_input_stream.h | 2 +-
.../gridgain/impl/interop/interop_memory.h | 2 +-
.../impl/interop/interop_output_stream.h | 2 +-
.../cpp/core/include/gridgain/impl/operations.h | 32 ++++++++++----------
.../gridgain/impl/portable/portable_common.h | 2 +-
.../impl/portable/portable_id_resolver.h | 8 ++---
.../impl/portable/portable_metadata_handler.h | 2 +-
.../impl/portable/portable_metadata_manager.h | 2 +-
.../impl/portable/portable_metadata_snapshot.h | 2 +-
.../impl/portable/portable_metadata_updater.h | 2 +-
.../portable/portable_metadata_updater_impl.h | 2 +-
.../impl/portable/portable_reader_impl.h | 24 +++++++--------
.../gridgain/impl/portable/portable_utils.h | 2 +-
.../impl/portable/portable_writer_impl.h | 20 ++++++------
.../include/gridgain/portable/portable_consts.h | 2 +-
.../gridgain/portable/portable_containers.h | 2 +-
.../gridgain/portable/portable_raw_reader.h | 8 ++---
.../gridgain/portable/portable_raw_writer.h | 10 +++---
.../include/gridgain/portable/portable_reader.h | 8 ++---
.../include/gridgain/portable/portable_type.h | 2 +-
.../include/gridgain/portable/portable_writer.h | 10 +++---
.../core/os/win/include/gridgain/impl/utils.h | 2 +-
.../src/main/cpp/core/os/win/src/impl/utils.cpp | 2 +-
modules/platform/src/main/cpp/core/src/grid.cpp | 4 +--
.../src/main/cpp/core/src/grid_error.cpp | 6 ++--
.../src/main/cpp/core/src/grid_factory.cpp | 6 ++--
modules/platform/src/main/cpp/core/src/guid.cpp | 2 +-
.../main/cpp/core/src/impl/cache/cache_impl.cpp | 22 +++++++-------
.../core/src/impl/cache/query/query_impl.cpp | 6 ++--
.../main/cpp/core/src/impl/grid_environment.cpp | 8 ++---
.../src/main/cpp/core/src/impl/grid_impl.cpp | 2 +-
.../main/cpp/core/src/impl/handle_registry.cpp | 2 +-
.../src/impl/interop/interop_input_stream.cpp | 2 +-
.../core/src/impl/interop/interop_memory.cpp | 2 +-
.../src/impl/interop/interop_output_stream.cpp | 2 +-
.../impl/portable/portable_metadata_handler.cpp | 2 +-
.../impl/portable/portable_metadata_manager.cpp | 2 +-
.../portable/portable_metadata_snapshot.cpp | 2 +-
.../impl/portable/portable_metadata_updater.cpp | 2 +-
.../portable/portable_metadata_updater_impl.cpp | 8 ++---
.../src/impl/portable/portable_reader_impl.cpp | 8 ++---
.../core/src/impl/portable/portable_utils.cpp | 6 ++--
.../src/impl/portable/portable_writer_impl.cpp | 12 ++++----
.../core/src/portable/portable_containers.cpp | 4 +--
.../core/src/portable/portable_raw_reader.cpp | 4 +--
.../core/src/portable/portable_raw_writer.cpp | 4 +--
.../cpp/core/src/portable/portable_reader.cpp | 4 +--
.../cpp/core/src/portable/portable_type.cpp | 2 +-
.../cpp/core/src/portable/portable_writer.cpp | 4 +--
77 files changed, 207 insertions(+), 212 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h b/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h
index 9e658a3..58ae419 100644
--- a/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h
+++ b/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_defs.h
@@ -15,7 +15,7 @@
#include "gridgain/portable/portable.h"
-namespace gridgain_test
+namespace ignite_test
{
namespace core
{
@@ -73,11 +73,11 @@ namespace gridgain_test
}
}
-namespace gridgain
+namespace ignite
{
namespace portable
{
- namespace gt = gridgain_test::core::portable;
+ namespace gt = ignite_test::core::portable;
template<>
struct PortableType<gt::PortableDummy>
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h b/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h
index e78b235..4df37c4 100644
--- a/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h
+++ b/modules/platform/src/main/cpp/core-test/include/gridgain/portable_test_utils.h
@@ -12,11 +12,11 @@
#include "gridgain/portable/portable.h"
-using namespace gridgain;
-using namespace gridgain::portable;
-using namespace gridgain::impl::portable;
+using namespace ignite;
+using namespace ignite::portable;
+using namespace ignite::impl::portable;
-namespace gridgain_test
+namespace ignite_test
{
namespace core
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/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 cc858ee..2cae873 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
@@ -26,10 +26,10 @@
using namespace boost::unit_test;
-using namespace gridgain;
-using namespace gridgain::cache;
-using namespace gridgain::cache::query;
-using namespace gridgain::impl::utils;
+using namespace ignite;
+using namespace ignite::cache;
+using namespace ignite::cache::query;
+using namespace ignite::impl::utils;
/**
* Person class for query tests.
@@ -128,7 +128,7 @@ private:
int age;
};
-namespace gridgain
+namespace ignite
{
namespace portable
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/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 9f870f9..7b62fd6 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
@@ -17,7 +17,7 @@
#include "gridgain/grid.h"
#include "gridgain/grid_factory.h"
-using namespace gridgain;
+using namespace ignite;
using namespace boost::unit_test;
/* Nodes started during the test. */
@@ -46,7 +46,7 @@ struct Person
}
};
-namespace gridgain
+namespace ignite
{
namespace portable
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/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 253a692..be6ed63 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
@@ -16,7 +16,7 @@
#include "gridgain/grid.h"
#include "gridgain/grid_factory.h"
-using namespace gridgain;
+using namespace ignite;
using namespace boost::unit_test;
BOOST_AUTO_TEST_SUITE(GridFactoryTestSuite)
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp b/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp
index 6ec2a02..9b2798b 100644
--- a/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/handle_registry_test.cpp
@@ -16,7 +16,7 @@
#include "gridgain/impl/handle_registry.h"
using namespace ignite::common::concurrent;
-using namespace gridgain::impl;
+using namespace ignite::impl;
struct HandleRegistryTestProbe
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp
index 59ee741..c213e67 100644
--- a/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_raw_test.cpp
@@ -19,11 +19,11 @@
#include "gridgain/portable_test_defs.h"
#include "gridgain/portable_test_utils.h"
-using namespace gridgain;
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
-using namespace gridgain::portable;
-using namespace gridgain_test::core::portable;
+using namespace ignite;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
+using namespace ignite::portable;
+using namespace ignite_test::core::portable;
template<typename T>
void CheckRawPrimitive(T val)
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp
index 139addc..c4f0a11 100644
--- a/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/portable_reader_writer_test.cpp
@@ -19,11 +19,11 @@
#include "gridgain/portable_test_defs.h"
#include "gridgain/portable_test_utils.h"
-using namespace gridgain;
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
-using namespace gridgain::portable;
-using namespace gridgain_test::core::portable;
+using namespace ignite;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
+using namespace ignite::portable;
+using namespace ignite_test::core::portable;
template<typename T>
void CheckPrimitive(T val)
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core-test/src/portable_session_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/portable_session_test.cpp b/modules/platform/src/main/cpp/core-test/src/portable_session_test.cpp
index 5eb732c..2f42971 100644
--- a/modules/platform/src/main/cpp/core-test/src/portable_session_test.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/portable_session_test.cpp
@@ -19,11 +19,11 @@
#include "gridgain/portable_test_defs.h"
-using namespace gridgain;
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
-using namespace gridgain::portable;
-using namespace gridgain_test::core::portable;
+using namespace ignite;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
+using namespace ignite::portable;
+using namespace ignite_test::core::portable;
/*
* Check primitive value serialization-deserialization.
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core-test/src/portable_test_defs.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core-test/src/portable_test_defs.cpp b/modules/platform/src/main/cpp/core-test/src/portable_test_defs.cpp
index bbb1acd..d96d4eb 100644
--- a/modules/platform/src/main/cpp/core-test/src/portable_test_defs.cpp
+++ b/modules/platform/src/main/cpp/core-test/src/portable_test_defs.cpp
@@ -12,12 +12,12 @@
#include "gridgain/portable_test_defs.h"
-using namespace gridgain;
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
-using namespace gridgain::portable;
+using namespace ignite;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
+using namespace ignite::portable;
-namespace gridgain_test
+namespace ignite_test
{
namespace core
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
index 81f01ab..940bff3 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache.h
@@ -33,7 +33,7 @@
#include "gridgain/impl/operations.h"
#include "gridgain/grid_error.h"
-namespace gridgain
+namespace ignite
{
namespace cache
{
@@ -1004,7 +1004,7 @@ namespace gridgain
*/
int32_t Size()
{
- return Size(gridgain::cache::IGNITE_PEEK_MODE_ALL);
+ return Size(ignite::cache::IGNITE_PEEK_MODE_ALL);
}
/**
@@ -1016,7 +1016,7 @@ namespace gridgain
*/
int32_t Size(GridError& err)
{
- return Size(gridgain::cache::IGNITE_PEEK_MODE_ALL, err);
+ return Size(ignite::cache::IGNITE_PEEK_MODE_ALL, err);
}
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h
index f2cd7ed..2b6c785 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_entry.h
@@ -20,7 +20,7 @@
#include <ignite/common/common.h>
-namespace gridgain
+namespace ignite
{
namespace cache
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
index c00525d..be61887 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/cache_peek_mode.h
@@ -18,7 +18,7 @@
#ifndef _IGNITE_CACHE_PEEK_MODE
#define _IGNITE_CACHE_PEEK_MODE
-namespace gridgain
+namespace ignite
{
namespace cache
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h
index c7a9d90..1ed96da 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_argument.h
@@ -20,7 +20,7 @@
#include "gridgain/portable/portable_raw_writer.h"
-namespace gridgain
+namespace ignite
{
namespace cache
{
@@ -50,7 +50,7 @@ namespace gridgain
/**
* Write argument.
*/
- virtual void Write(gridgain::portable::PortableRawWriter& writer) = 0;
+ virtual void Write(ignite::portable::PortableRawWriter& writer) = 0;
};
/**
@@ -109,7 +109,7 @@ namespace gridgain
return new QueryArgument(val);
}
- void Write(gridgain::portable::PortableRawWriter& writer)
+ void Write(ignite::portable::PortableRawWriter& writer)
{
writer.WriteObject<T>(val);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
index 6f8dd3e..dbe738c 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_cursor.h
@@ -27,7 +27,7 @@
#include "gridgain/impl/cache/query/query_impl.h"
#include "gridgain/impl/operations.h"
-namespace gridgain
+namespace ignite
{
namespace cache
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h
index 4a8aeff..0955aee 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_scan.h
@@ -23,7 +23,7 @@
#include "gridgain/portable/portable_raw_writer.h"
-namespace gridgain
+namespace ignite
{
namespace cache
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h
index 089e775..aab4398 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_sql.h
@@ -25,7 +25,7 @@
#include "gridgain/cache/query/query_argument.h"
#include "gridgain/portable/portable_raw_writer.h"
-namespace gridgain
+namespace ignite
{
namespace cache
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h
index 430ce60..016684c 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/cache/query/query_text.h
@@ -23,7 +23,7 @@
#include "gridgain/portable/portable_raw_writer.h"
-namespace gridgain
+namespace ignite
{
namespace cache
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/grid.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid.h b/modules/platform/src/main/cpp/core/include/gridgain/grid.h
index 528a884..efd3d57 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid.h
@@ -22,7 +22,7 @@
#include "gridgain/impl/grid_impl.h"
#include "gridgain/grid_configuration.h"
-namespace gridgain
+namespace ignite
{
/**
* Main interface to operate with GridGain.
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h b/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h
index 8940e32..65d2c8e 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid_configuration.h
@@ -20,7 +20,7 @@
#include <stdint.h>
-namespace gridgain
+namespace ignite
{
/**
* Single JVM option.
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
index 6774b45..47c54b1 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid_error.h
@@ -26,46 +26,46 @@
#define IGNITE_ERROR_1(code, part1) { \
std::stringstream stream; \
stream << (part1); \
- throw gridgain::GridError(code, stream.str().c_str()); \
+ throw ignite::GridError(code, stream.str().c_str()); \
}
#define IGNITE_ERROR_2(code, part1, part2) { \
std::stringstream stream; \
stream << (part1) << (part2); \
- throw gridgain::GridError(code, stream.str().c_str()); \
+ throw ignite::GridError(code, stream.str().c_str()); \
}
#define IGNITE_ERROR_3(code, part1, part2, part3) { \
std::stringstream stream; \
stream << (part1) << (part2) << (part3); \
- throw gridgain::GridError(code, stream.str().c_str()); \
+ throw ignite::GridError(code, stream.str().c_str()); \
}
#define IGNITE_ERROR_FORMATTED_1(code, msg, key1, val1) { \
std::stringstream stream; \
stream << msg << " [" << key1 << "=" << (val1) << "]"; \
- throw gridgain::GridError(code, stream.str().c_str()); \
+ throw ignite::GridError(code, stream.str().c_str()); \
}
#define IGNITE_ERROR_FORMATTED_2(code, msg, key1, val1, key2, val2) { \
std::stringstream stream; \
stream << msg << " [" << key1 << "=" << (val1) << ", " << key2 << "=" << (val2) << "]"; \
- throw gridgain::GridError(code, stream.str().c_str()); \
+ throw ignite::GridError(code, stream.str().c_str()); \
}
#define IGNITE_ERROR_FORMATTED_3(code, msg, key1, val1, key2, val2, key3, val3) { \
std::stringstream stream; \
stream << msg << " [" << key1 << "=" << (val1) << ", " << key2 << "=" << (val2) << ", " << key3 << "=" << (val3) << "]"; \
- throw gridgain::GridError(code, stream.str().c_str()); \
+ throw ignite::GridError(code, stream.str().c_str()); \
}
#define IGNITE_ERROR_FORMATTED_4(code, msg, key1, val1, key2, val2, key3, val3, key4, val4) { \
std::stringstream stream; \
stream << msg << " [" << key1 << "=" << (val1) << ", " << key2 << "=" << (val2) << ", " << key3 << "=" << (val3) << ", " << key4 << "=" << (val4) << "]"; \
- throw gridgain::GridError(code, stream.str().c_str()); \
+ throw ignite::GridError(code, stream.str().c_str()); \
}
-namespace gridgain
+namespace ignite
{
/**
* Grid error information.
@@ -175,9 +175,6 @@ namespace gridgain
/** Security error. */
static const int IGNITE_ERR_SECURITY = 2023;
- /** Product license error. */
- static const int IGNITE_ERR_PRODUCT_LICENSE = 2024;
-
/** Unknown error. */
static const int IGNITE_ERR_UNKNOWN = -1;
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h b/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h
index 909fcac..0d45b97 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/grid_factory.h
@@ -63,7 +63,7 @@
#include "gridgain/grid_configuration.h"
#include "gridgain/grid_error.h"
-namespace gridgain
+namespace ignite
{
/**
* This class defines a factory for the main GridGain API.
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/guid.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/guid.h b/modules/platform/src/main/cpp/core/include/gridgain/guid.h
index 51da8c4..9469769 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/guid.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/guid.h
@@ -22,7 +22,7 @@
#include <ignite/common/common.h>
-namespace gridgain
+namespace ignite
{
/**
* Global universally unique identifier (GUID).
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h
index 0777ecc..e769402 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/cache_impl.h
@@ -25,7 +25,7 @@
#include "gridgain/impl/cache/query/query_impl.h"
#include "gridgain/impl/operations.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
@@ -297,7 +297,7 @@ namespace gridgain
* @param err Error.
* @return Query cursor.
*/
- query::QueryCursorImpl* QuerySql(const gridgain::cache::query::SqlQuery& qry, GridError* err);
+ query::QueryCursorImpl* QuerySql(const ignite::cache::query::SqlQuery& qry, GridError* err);
/*
* Invoke text query.
@@ -306,7 +306,7 @@ namespace gridgain
* @param err Error.
* @return Query cursor.
*/
- query::QueryCursorImpl* QueryText(const gridgain::cache::query::TextQuery& qry, GridError* err);
+ query::QueryCursorImpl* QueryText(const ignite::cache::query::TextQuery& qry, GridError* err);
/*
* Invoke scan query.
@@ -315,7 +315,7 @@ namespace gridgain
* @param err Error.
* @return Query cursor.
*/
- query::QueryCursorImpl* QueryScan(const gridgain::cache::query::ScanQuery& qry, GridError* err);
+ query::QueryCursorImpl* QueryScan(const ignite::cache::query::ScanQuery& qry, GridError* err);
private:
/** Name. */
@@ -394,7 +394,7 @@ namespace gridgain
interop::InteropMemory* mem0 = mem.Get();
interop::InteropOutputStream out(mem0);
portable::PortableWriterImpl writer(&out, env.Get()->GetMetadataManager());
- gridgain::portable::PortableRawWriter rawWriter(&writer);
+ ignite::portable::PortableRawWriter rawWriter(&writer);
qry.Write(rawWriter);
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h
index 703a347..7cf84fe 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/cache/query/query_impl.h
@@ -22,7 +22,7 @@
#include <gridgain/grid_error.h>
#include <gridgain/impl/operations.h>
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h
index 568e69f..600a699 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_environment.h
@@ -24,7 +24,7 @@
#include "gridgain/impl/interop/interop_memory.h"
#include "portable/portable_metadata_manager.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h
index 3a13105..6c45ec2 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/grid_impl.h
@@ -25,7 +25,7 @@
#include "gridgain/impl/grid_environment.h"
#include "gridgain/impl/utils.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h
index b57722c..5e1b60a 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/handle_registry.h
@@ -23,7 +23,7 @@
#include <ignite/common/concurrent.h>
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h
index f1ca2f9..4cf3b04 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_input_stream.h
@@ -20,7 +20,7 @@
#include "gridgain/impl/interop/interop_memory.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
index 566a768..00cba43 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_memory.h
@@ -22,7 +22,7 @@
#include <ignite/common/common.h>
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h
index cc31db2..d75eefb 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/interop/interop_output_stream.h
@@ -20,7 +20,7 @@
#include "gridgain/impl/interop/interop_memory.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h
index 8e937cb..87f7d11 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/operations.h
@@ -29,7 +29,7 @@
#include "gridgain/impl/portable/portable_writer_impl.h"
#include "gridgain/portable/portable.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
@@ -52,7 +52,7 @@ namespace gridgain
*
* @param writer Writer.
*/
- virtual void ProcessInput(gridgain::impl::portable::PortableWriterImpl& writer) = 0;
+ virtual void ProcessInput(ignite::impl::portable::PortableWriterImpl& writer) = 0;
};
/**
@@ -72,7 +72,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessInput(gridgain::impl::portable::PortableWriterImpl& writer)
+ virtual void ProcessInput(ignite::impl::portable::PortableWriterImpl& writer)
{
writer.WriteTopObject<T>(*val);
}
@@ -101,7 +101,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessInput(gridgain::impl::portable::PortableWriterImpl& writer)
+ virtual void ProcessInput(ignite::impl::portable::PortableWriterImpl& writer)
{
writer.WriteTopObject<T1>(*val1);
writer.WriteTopObject<T2>(*val2);
@@ -135,7 +135,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessInput(gridgain::impl::portable::PortableWriterImpl& writer)
+ virtual void ProcessInput(ignite::impl::portable::PortableWriterImpl& writer)
{
writer.WriteTopObject<T1>(*val1);
writer.WriteTopObject<T2>(*val2);
@@ -171,7 +171,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessInput(gridgain::impl::portable::PortableWriterImpl& writer)
+ virtual void ProcessInput(ignite::impl::portable::PortableWriterImpl& writer)
{
writer.GetStream()->WriteInt32(static_cast<int32_t>(val->size()));
@@ -202,7 +202,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessInput(gridgain::impl::portable::PortableWriterImpl& writer)
+ virtual void ProcessInput(ignite::impl::portable::PortableWriterImpl& writer)
{
writer.GetStream()->WriteInt32(static_cast<int32_t>(val->size()));
@@ -236,7 +236,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessInput(gridgain::impl::portable::PortableWriterImpl& writer)
+ virtual void ProcessInput(ignite::impl::portable::PortableWriterImpl& writer)
{
writer.WriteTopObject<T>(*key);
writer.GetStream()->WriteInt32(peekModes);
@@ -270,7 +270,7 @@ namespace gridgain
*
* @param reader Reader.
*/
- virtual void ProcessOutput(gridgain::impl::portable::PortableReaderImpl& reader) = 0;
+ virtual void ProcessOutput(ignite::impl::portable::PortableReaderImpl& reader) = 0;
};
/**
@@ -288,7 +288,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessOutput(gridgain::impl::portable::PortableReaderImpl& reader)
+ virtual void ProcessOutput(ignite::impl::portable::PortableReaderImpl& reader)
{
val = reader.ReadTopObject<T>();
}
@@ -324,7 +324,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessOutput(gridgain::impl::portable::PortableReaderImpl& reader)
+ virtual void ProcessOutput(ignite::impl::portable::PortableReaderImpl& reader)
{
val1 = reader.ReadTopObject<T1>();
val2 = reader.ReadTopObject<T2>();
@@ -375,7 +375,7 @@ namespace gridgain
// No-op.
}
- virtual void ProcessOutput(gridgain::impl::portable::PortableReaderImpl& reader)
+ virtual void ProcessOutput(ignite::impl::portable::PortableReaderImpl& reader)
{
bool exists = reader.GetStream()->ReadBool();
@@ -422,12 +422,12 @@ namespace gridgain
/**
* Constructor.
*/
- OutQueryGetAllOperation(std::vector<gridgain::cache::CacheEntry<K, V>>* res) : res(res)
+ OutQueryGetAllOperation(std::vector<ignite::cache::CacheEntry<K, V>>* res) : res(res)
{
// No-op.
}
- virtual void ProcessOutput(gridgain::impl::portable::PortableReaderImpl& reader)
+ virtual void ProcessOutput(ignite::impl::portable::PortableReaderImpl& reader)
{
int32_t cnt = reader.ReadInt32();
@@ -436,13 +436,13 @@ namespace gridgain
K key = reader.ReadTopObject<K>();
V val = reader.ReadTopObject<V>();
- res->push_back(gridgain::cache::CacheEntry<K, V>(key, val));
+ res->push_back(ignite::cache::CacheEntry<K, V>(key, val));
}
}
private:
/** Entries. */
- std::vector<gridgain::cache::CacheEntry<K, V>>* res;
+ std::vector<ignite::cache::CacheEntry<K, V>>* res;
IGNITE_NO_COPY_ASSIGNMENT(OutQueryGetAllOperation)
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
index 7477c44..622cb54 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_common.h
@@ -20,7 +20,7 @@
#include <stdint.h>
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
index 825f919..00447d9 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_id_resolver.h
@@ -20,7 +20,7 @@
#include "gridgain/portable/portable_type.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
@@ -69,7 +69,7 @@ namespace gridgain
*/
TemplatedPortableIdResolver()
{
- type = gridgain::portable::PortableType<T>();
+ type = ignite::portable::PortableType<T>();
}
/**
@@ -77,7 +77,7 @@ namespace gridgain
*
* @param type Portable type.
*/
- TemplatedPortableIdResolver(gridgain::portable::PortableType<T> type) : type(type)
+ TemplatedPortableIdResolver(ignite::portable::PortableType<T> type) : type(type)
{
// No-op.
}
@@ -97,7 +97,7 @@ namespace gridgain
}
private:
/** Actual type. */
- gridgain::portable::PortableType<T> type;
+ ignite::portable::PortableType<T> type;
};
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h
index bc38486..c55e6b2 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_handler.h
@@ -22,7 +22,7 @@
#include "gridgain/impl/portable/portable_metadata_snapshot.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h
index eeab4d3..64dc0a3c 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_manager.h
@@ -25,7 +25,7 @@
#include "gridgain/impl/portable/portable_metadata_handler.h"
#include "gridgain/impl/portable/portable_metadata_updater.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h
index 68eba75..1e000fc 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_snapshot.h
@@ -26,7 +26,7 @@
#include <ignite/common/common.h>
#include <ignite/common/concurrent.h>
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h
index 8a1a615..a2fb9ed 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater.h
@@ -21,7 +21,7 @@
#include "gridgain/grid_error.h"
#include "gridgain/impl/portable/portable_metadata_snapshot.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h
index ae447d2..7ce86e7 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_metadata_updater_impl.h
@@ -23,7 +23,7 @@
#include "gridgain/impl/grid_environment.h"
#include "gridgain/impl/portable/portable_metadata_updater.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
index edee162..75debc4 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_reader_impl.h
@@ -31,7 +31,7 @@
#include "gridgain/portable/portable_type.h"
#include "gridgain/guid.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
@@ -505,7 +505,7 @@ namespace gridgain
* @param size Collection size.
* @return Read session ID.
*/
- int32_t ReadCollection(gridgain::portable::CollectionType* typ, int32_t* size);
+ int32_t ReadCollection(ignite::portable::CollectionType* typ, int32_t* size);
/**
* Start collection read.
@@ -515,7 +515,7 @@ namespace gridgain
* @param size Collection size.
* @return Read session ID.
*/
- int32_t ReadCollection(const char* fieldName, gridgain::portable::CollectionType* typ, int32_t* size);
+ int32_t ReadCollection(const char* fieldName, ignite::portable::CollectionType* typ, int32_t* size);
/**
* Start map read.
@@ -524,7 +524,7 @@ namespace gridgain
* @param size Map size.
* @return Read session ID.
*/
- int32_t ReadMap(gridgain::portable::MapType* typ, int32_t* size);
+ int32_t ReadMap(ignite::portable::MapType* typ, int32_t* size);
/**
* Start map read.
@@ -534,7 +534,7 @@ namespace gridgain
* @param size Map size.
* @return Read session ID.
*/
- int32_t ReadMap(const char* fieldName, gridgain::portable::MapType* typ, int32_t* size);
+ int32_t ReadMap(const char* fieldName, ignite::portable::MapType* typ, int32_t* size);
/**
* Check whether next value exists.
@@ -639,7 +639,7 @@ namespace gridgain
if (hdr == IGNITE_HDR_NULL)
return GetNull<T>();
else if (hdr == IGNITE_HDR_HND) {
- IGNITE_ERROR_1(gridgain::GridError::IGNITE_ERR_PORTABLE, "Circular references are not supported.");
+ IGNITE_ERROR_1(ignite::GridError::IGNITE_ERR_PORTABLE, "Circular references are not supported.");
}
else if (hdr == IGNITE_TYPE_PORTABLE)
{
@@ -663,10 +663,10 @@ namespace gridgain
int32_t len = stream->ReadInt32();
int32_t rawOff = stream->ReadInt32();
- gridgain::portable::PortableType<T> type;
+ ignite::portable::PortableType<T> type;
TemplatedPortableIdResolver<T> idRslvr(type);
PortableReaderImpl readerImpl(stream, &idRslvr, pos, usrType, typeId, hashCode, len, rawOff);
- gridgain::portable::PortableReader reader(&readerImpl);
+ ignite::portable::PortableReader reader(&readerImpl);
T val = type.Read(reader);
@@ -682,7 +682,7 @@ namespace gridgain
template<typename T>
T GetNull()
{
- gridgain::portable::PortableType<T> type;
+ ignite::portable::PortableType<T> type;
return type.GetNull();
}
@@ -1020,7 +1020,7 @@ namespace gridgain
* @param func Function to be applied to the stream.
*/
template<typename T>
- T ReadTopObject0(const int8_t expHdr, T(*func) (gridgain::impl::interop::InteropInputStream*))
+ T ReadTopObject0(const int8_t expHdr, T(*func) (ignite::impl::interop::InteropInputStream*))
{
int8_t typeId = stream->ReadInt8();
@@ -1043,7 +1043,7 @@ namespace gridgain
* @param dflt Default value.
*/
template<typename T>
- T ReadTopObject0(const int8_t expHdr, T(*func) (gridgain::impl::interop::InteropInputStream*), T dflt)
+ T ReadTopObject0(const int8_t expHdr, T(*func) (ignite::impl::interop::InteropInputStream*), T dflt)
{
int8_t typeId = stream->ReadInt8();
@@ -1097,7 +1097,7 @@ namespace gridgain
bool utf8Mode = stream->ReadBool();
int32_t realLen = stream->ReadInt32();
- gridgain::impl::utils::SafeArray<char> arr(realLen + 1);
+ ignite::impl::utils::SafeArray<char> arr(realLen + 1);
if (utf8Mode)
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h
index 17a428f..aa7ecba 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_utils.h
@@ -22,7 +22,7 @@
#include "gridgain/guid.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
index 96e718f..41f8c37 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/impl/portable/portable_writer_impl.h
@@ -34,7 +34,7 @@
#include "gridgain/portable/portable_type.h"
#include "gridgain/guid.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
@@ -54,7 +54,7 @@ namespace gridgain
* @param metaMgr Metadata manager.
* @param metaHnd Metadata handler.
*/
- PortableWriterImpl(gridgain::impl::interop::InteropOutputStream* stream, PortableIdResolver* idRslvr,
+ PortableWriterImpl(ignite::impl::interop::InteropOutputStream* stream, PortableIdResolver* idRslvr,
PortableMetadataManager* metaMgr, PortableMetadataHandler* metaHnd);
/**
@@ -64,7 +64,7 @@ namespace gridgain
* @param stream Interop stream.
* @param metaMgr Metadata manager.
*/
- PortableWriterImpl(gridgain::impl::interop::InteropOutputStream* stream, PortableMetadataManager* metaMgr);
+ PortableWriterImpl(ignite::impl::interop::InteropOutputStream* stream, PortableMetadataManager* metaMgr);
/**
* Write 8-byte signed integer. Maps to "byte" type in Java.
@@ -430,7 +430,7 @@ namespace gridgain
* @param typ Collection type.
* @return Session ID.
*/
- int32_t WriteCollection(gridgain::portable::CollectionType typ);
+ int32_t WriteCollection(ignite::portable::CollectionType typ);
/**
* Start collection write.
@@ -439,7 +439,7 @@ namespace gridgain
* @param typ Collection type.
* @return Session ID.
*/
- int32_t WriteCollection(const char* fieldName, gridgain::portable::CollectionType typ);
+ int32_t WriteCollection(const char* fieldName, ignite::portable::CollectionType typ);
/**
* Start map write.
@@ -447,7 +447,7 @@ namespace gridgain
* @param typ Map type.
* @return Session ID.
*/
- int32_t WriteMap(gridgain::portable::MapType typ);
+ int32_t WriteMap(ignite::portable::MapType typ);
/**
* Start map write.
@@ -456,7 +456,7 @@ namespace gridgain
* @param typ Map type.
* @return Session ID.
*/
- int32_t WriteMap(const char* fieldName, gridgain::portable::MapType typ);
+ int32_t WriteMap(const char* fieldName, ignite::portable::MapType typ);
/**
* Write collection element.
@@ -556,7 +556,7 @@ namespace gridgain
template<typename T>
void WriteTopObject(const T& obj)
{
- gridgain::portable::PortableType<T> type;
+ ignite::portable::PortableType<T> type;
if (type.IsNull(obj))
stream->WriteInt8(IGNITE_HDR_NULL);
@@ -569,7 +569,7 @@ namespace gridgain
metaHnd = metaMgr->GetHandler(idRslvr.GetTypeId());
PortableWriterImpl writerImpl(stream, &idRslvr, metaMgr, metaHnd.Get());
- gridgain::portable::PortableWriter writer(&writerImpl);
+ ignite::portable::PortableWriter writer(&writerImpl);
int32_t pos = stream->Position();
@@ -600,7 +600,7 @@ namespace gridgain
impl::interop::InteropOutputStream* GetStream();
private:
/** Underlying stream. */
- gridgain::impl::interop::InteropOutputStream* stream;
+ ignite::impl::interop::InteropOutputStream* stream;
/** ID resolver. */
PortableIdResolver* idRslvr;
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
index 2c1f6bc..ef6db45 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_consts.h
@@ -20,7 +20,7 @@
#include <ignite/common/common.h>
-namespace gridgain
+namespace ignite
{
namespace portable
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h
index 02e9d3e..85d8f1b 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_containers.h
@@ -25,7 +25,7 @@
#include "gridgain/impl/utils.h"
#include "gridgain/portable/portable_consts.h"
-namespace gridgain
+namespace ignite
{
namespace portable
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h
index c26271f..addf4a3 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_reader.h
@@ -28,7 +28,7 @@
#include "gridgain/portable/portable_containers.h"
#include "gridgain/guid.h"
-namespace gridgain
+namespace ignite
{
namespace portable
{
@@ -43,7 +43,7 @@ namespace gridgain
*
* @param impl Implementation.
*/
- PortableRawReader(gridgain::impl::portable::PortableReaderImpl* impl);
+ PortableRawReader(ignite::impl::portable::PortableReaderImpl* impl);
/**
* Read 8-byte signed integer. Maps to "byte" type in Java.
@@ -240,7 +240,7 @@ namespace gridgain
if (len != -1)
{
- gridgain::impl::utils::SafeArray<char> arr(len + 1);
+ ignite::impl::utils::SafeArray<char> arr(len + 1);
ReadString(arr.target, len + 1);
@@ -316,7 +316,7 @@ namespace gridgain
}
private:
/** Implementation delegate. */
- gridgain::impl::portable::PortableReaderImpl* impl;
+ ignite::impl::portable::PortableReaderImpl* impl;
};
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
index 3a3ac38..1e71296 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_raw_writer.h
@@ -27,7 +27,7 @@
#include "gridgain/portable/portable_containers.h"
#include "gridgain/guid.h"
-namespace gridgain
+namespace ignite
{
namespace portable
{
@@ -42,7 +42,7 @@ namespace gridgain
*
* @param impl Implementation.
*/
- PortableRawWriter(gridgain::impl::portable::PortableWriterImpl* impl);
+ PortableRawWriter(ignite::impl::portable::PortableWriterImpl* impl);
/**
* Write 8-byte signed integer. Maps to "byte" type in Java.
@@ -247,7 +247,7 @@ namespace gridgain
* @return Collection writer.
*/
template<typename T>
- PortableCollectionWriter<T> WriteCollection(gridgain::portable::CollectionType typ)
+ PortableCollectionWriter<T> WriteCollection(ignite::portable::CollectionType typ)
{
int32_t id = impl->WriteCollection(typ);
@@ -273,7 +273,7 @@ namespace gridgain
* @return Map writer.
*/
template<typename K, typename V>
- PortableMapWriter<K, V> WriteMap(gridgain::portable::MapType typ)
+ PortableMapWriter<K, V> WriteMap(ignite::portable::MapType typ)
{
int32_t id = impl->WriteMap(typ);
@@ -292,7 +292,7 @@ namespace gridgain
}
private:
/** Implementation delegate. */
- gridgain::impl::portable::PortableWriterImpl* impl;
+ ignite::impl::portable::PortableWriterImpl* impl;
};
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h
index 2f49859..b8fa2e0 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_reader.h
@@ -26,7 +26,7 @@
#include "gridgain/portable/portable_raw_reader.h"
#include "gridgain/guid.h"
-namespace gridgain
+namespace ignite
{
namespace portable
{
@@ -41,7 +41,7 @@ namespace gridgain
*
* @param impl Implementation.
*/
- PortableReader(gridgain::impl::portable::PortableReaderImpl* impl);
+ PortableReader(ignite::impl::portable::PortableReaderImpl* impl);
/**
* Read 8-byte signed integer. Maps to "byte" type in Java.
@@ -259,7 +259,7 @@ namespace gridgain
if (len != -1)
{
- gridgain::impl::utils::SafeArray<char> arr(len + 1);
+ ignite::impl::utils::SafeArray<char> arr(len + 1);
ReadString(fieldName, arr.target, len + 1);
@@ -347,7 +347,7 @@ namespace gridgain
PortableRawReader RawReader();
private:
/** Implementation delegate. */
- gridgain::impl::portable::PortableReaderImpl* impl;
+ ignite::impl::portable::PortableReaderImpl* impl;
};
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
index c1fda73..c5c1cdb 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_type.h
@@ -119,7 +119,7 @@ T GetNull() \
return NULL; \
}
-namespace gridgain
+namespace ignite
{
namespace portable
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
index 2cbc201..9d3a281 100644
--- a/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
+++ b/modules/platform/src/main/cpp/core/include/gridgain/portable/portable_writer.h
@@ -25,7 +25,7 @@
#include "gridgain/portable/portable_raw_writer.h"
-namespace gridgain
+namespace ignite
{
namespace portable
{
@@ -40,7 +40,7 @@ namespace gridgain
*
* @param impl Implementation.
*/
- PortableWriter(gridgain::impl::portable::PortableWriterImpl* impl);
+ PortableWriter(ignite::impl::portable::PortableWriterImpl* impl);
/**
* Write 8-byte signed integer. Maps to "byte" type in Java.
@@ -272,7 +272,7 @@ namespace gridgain
* @return Collection writer.
*/
template<typename T>
- PortableCollectionWriter<T> WriteCollection(const char* fieldName, gridgain::portable::CollectionType typ)
+ PortableCollectionWriter<T> WriteCollection(const char* fieldName, ignite::portable::CollectionType typ)
{
int32_t id = impl->WriteCollection(fieldName, typ);
@@ -300,7 +300,7 @@ namespace gridgain
* @return Map writer.
*/
template<typename K, typename V>
- PortableMapWriter<K, V> WriteMap(const char* fieldName, gridgain::portable::MapType typ)
+ PortableMapWriter<K, V> WriteMap(const char* fieldName, ignite::portable::MapType typ)
{
int32_t id = impl->WriteMap(fieldName, typ);
@@ -327,7 +327,7 @@ namespace gridgain
PortableRawWriter RawWriter();
private:
/** Implementation delegate. */
- gridgain::impl::portable::PortableWriterImpl* impl;
+ ignite::impl::portable::PortableWriterImpl* impl;
};
}
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/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 3ad40b7..2380930 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
@@ -29,7 +29,7 @@
#define IGNITE_FRIEND_EXPORT
#endif
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/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 3223cad..16a1451 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
@@ -19,7 +19,7 @@
#include "gridgain/impl/utils.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/grid.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/grid.cpp b/modules/platform/src/main/cpp/core/src/grid.cpp
index b6dd72d..fd25702 100644
--- a/modules/platform/src/main/cpp/core/src/grid.cpp
+++ b/modules/platform/src/main/cpp/core/src/grid.cpp
@@ -21,9 +21,9 @@
#include "gridgain/grid.h"
using namespace ignite::common::concurrent;
-using namespace gridgain::impl;
+using namespace ignite::impl;
-namespace gridgain
+namespace ignite
{
Grid::Grid() : impl(SharedPointer<GridImpl>())
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/grid_error.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/grid_error.cpp b/modules/platform/src/main/cpp/core/src/grid_error.cpp
index 95992ce..a909ff6 100644
--- a/modules/platform/src/main/cpp/core/src/grid_error.cpp
+++ b/modules/platform/src/main/cpp/core/src/grid_error.cpp
@@ -20,9 +20,9 @@
#include "gridgain/grid_error.h"
using namespace ignite::common::java;
-using namespace gridgain::impl::utils;
+using namespace ignite::impl::utils;
-namespace gridgain
+namespace ignite
{
void GridError::ThrowIfNeeded(GridError& err)
{
@@ -170,8 +170,6 @@ namespace gridgain
*err = GridError(IGNITE_ERR_AUTHENTICATION, jniMsg);
else if (jniCls0.compare("org.apache.ignite.plugin.security.GridSecurityException") == 0)
*err = GridError(IGNITE_ERR_SECURITY, jniMsg);
- else if (jniCls0.compare("org.gridgain.grid.product.ProductLicenseException") == 0)
- *err = GridError(IGNITE_ERR_PRODUCT_LICENSE, jniMsg);
else if (jniCls0.compare("org.apache.ignite.IgniteException") == 0)
*err = GridError(IGNITE_ERR_GENERIC, jniMsg);
else if (jniCls0.compare("org.apache.ignite.IgniteCheckedException") == 0)
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/grid_factory.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/grid_factory.cpp b/modules/platform/src/main/cpp/core/src/grid_factory.cpp
index b2ef1e2..0014320 100644
--- a/modules/platform/src/main/cpp/core/src/grid_factory.cpp
+++ b/modules/platform/src/main/cpp/core/src/grid_factory.cpp
@@ -29,10 +29,10 @@
using namespace ignite::common::concurrent;
using namespace ignite::common::java;
-using namespace gridgain::impl;
-using namespace gridgain::impl::utils;
+using namespace ignite::impl;
+using namespace ignite::impl::utils;
-namespace gridgain
+namespace ignite
{
/** Default configuration. */
const char* GRID_DFLT_CFG = "config/default-config.xml";
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/guid.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/guid.cpp b/modules/platform/src/main/cpp/core/src/guid.cpp
index c747480..75670e6 100644
--- a/modules/platform/src/main/cpp/core/src/guid.cpp
+++ b/modules/platform/src/main/cpp/core/src/guid.cpp
@@ -17,7 +17,7 @@
#include "gridgain/guid.h"
-namespace gridgain
+namespace ignite
{
Guid::Guid() : most(0), least(0)
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp
index f6354ec..637e7a1 100644
--- a/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/cache/cache_impl.cpp
@@ -25,16 +25,16 @@
using namespace ignite::common::concurrent;
using namespace ignite::common::java;
-using namespace gridgain::cache;
-using namespace gridgain::cache::query;
-using namespace gridgain::impl;
-using namespace gridgain::impl::cache::query;
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
-using namespace gridgain::impl::utils;
-using namespace gridgain::portable;
-
-namespace gridgain
+using namespace ignite::cache;
+using namespace ignite::cache::query;
+using namespace ignite::impl;
+using namespace ignite::impl::cache::query;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
+using namespace ignite::impl::utils;
+using namespace ignite::portable;
+
+namespace ignite
{
namespace impl
{
@@ -171,7 +171,7 @@ namespace gridgain
OutOpInternal(OP_PUT, inOp, err);
}
- void CacheImpl::PutAll(gridgain::impl::InputOperation& inOp, GridError* err)
+ void CacheImpl::PutAll(ignite::impl::InputOperation& inOp, GridError* err)
{
OutOpInternal(OP_PUT_ALL, inOp, err);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp
index d10a6dd..35b7fd9 100644
--- a/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/cache/query/query_impl.cpp
@@ -19,10 +19,10 @@
using namespace ignite::common::concurrent;
using namespace ignite::common::java;
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/grid_environment.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/grid_environment.cpp b/modules/platform/src/main/cpp/core/src/impl/grid_environment.cpp
index bce5f0d..e66da91 100644
--- a/modules/platform/src/main/cpp/core/src/impl/grid_environment.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/grid_environment.cpp
@@ -21,11 +21,11 @@
using namespace ignite::common::concurrent;
using namespace ignite::common::java;
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
-using namespace gridgain::portable;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
+using namespace ignite::portable;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/grid_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/grid_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/grid_impl.cpp
index 6bebf9c..b79e548 100644
--- a/modules/platform/src/main/cpp/core/src/impl/grid_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/grid_impl.cpp
@@ -20,7 +20,7 @@
using namespace ignite::common::concurrent;
using namespace ignite::common::java;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/handle_registry.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/handle_registry.cpp b/modules/platform/src/main/cpp/core/src/impl/handle_registry.cpp
index 72ffac8..c52833c 100644
--- a/modules/platform/src/main/cpp/core/src/impl/handle_registry.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/handle_registry.cpp
@@ -19,7 +19,7 @@
using namespace ignite::common::concurrent;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp b/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
index 89fb5fa..c938416 100644
--- a/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/interop/interop_input_stream.cpp
@@ -37,7 +37,7 @@
CopyAndShift(reinterpret_cast<int8_t*>(res), 0, len << shift); \
}
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp b/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
index d0024d8..52e19e7 100644
--- a/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/interop/interop_memory.cpp
@@ -22,7 +22,7 @@
using namespace ignite::common::java;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp b/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp
index 27a47d3..ebf2c67 100644
--- a/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/interop/interop_output_stream.cpp
@@ -36,7 +36,7 @@
CopyAndShift(reinterpret_cast<const int8_t*>(val), 0, len); \
}
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_handler.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_handler.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_handler.cpp
index 3cda810..1ad40d0 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_handler.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_handler.cpp
@@ -19,7 +19,7 @@
using namespace ignite::common::concurrent;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_manager.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_manager.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_manager.cpp
index ad456c5..fe5b5c6 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_manager.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_manager.cpp
@@ -21,7 +21,7 @@
using namespace ignite::common::concurrent;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_snapshot.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_snapshot.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_snapshot.cpp
index 08790f4..f9a57fc 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_snapshot.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_snapshot.cpp
@@ -17,7 +17,7 @@
#include "gridgain/impl/portable/portable_metadata_snapshot.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater.cpp
index 7720eba..f0f8e8e 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater.cpp
@@ -17,7 +17,7 @@
#include "gridgain/impl/portable/portable_metadata_updater.h"
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater_impl.cpp
index a685772..ea89b53 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_metadata_updater_impl.cpp
@@ -22,11 +22,11 @@
using namespace ignite::common::concurrent;
using namespace ignite::common::java;
-using namespace gridgain::impl;
-using namespace gridgain::impl::interop;
-using namespace gridgain::portable;
+using namespace ignite::impl;
+using namespace ignite::impl::interop;
+using namespace ignite::portable;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
index fc72552..264885c 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_reader_impl.cpp
@@ -23,11 +23,11 @@
#include "gridgain/portable/portable_type.h"
#include "gridgain/grid_error.h"
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
-using namespace gridgain::portable;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
+using namespace ignite::portable;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/portable/portable_utils.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_utils.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_utils.cpp
index e6ac052..3f9c48d 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_utils.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_utils.cpp
@@ -18,10 +18,10 @@
#include "gridgain/impl/interop/interop.h"
#include "gridgain/impl/portable/portable_utils.h"
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
-namespace gridgain
+namespace ignite
{
namespace impl
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp b/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
index 16bd990..a4eb5b6 100644
--- a/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
+++ b/modules/platform/src/main/cpp/core/src/impl/portable/portable_writer_impl.cpp
@@ -18,11 +18,11 @@
#include "gridgain/impl/portable/portable_writer_impl.h"
#include "gridgain/grid_error.h"
-using namespace gridgain::impl::interop;
-using namespace gridgain::impl::portable;
-using namespace gridgain::portable;
+using namespace ignite::impl::interop;
+using namespace ignite::impl::portable;
+using namespace ignite::portable;
-namespace gridgain
+namespace ignite
{
namespace impl
{
@@ -418,7 +418,7 @@ namespace gridgain
return elemId;
}
- int32_t PortableWriterImpl::WriteMap(gridgain::portable::MapType typ)
+ int32_t PortableWriterImpl::WriteMap(ignite::portable::MapType typ)
{
StartContainerSession(true);
@@ -429,7 +429,7 @@ namespace gridgain
return elemId;
}
- int32_t PortableWriterImpl::WriteMap(const char* fieldName, gridgain::portable::MapType typ)
+ int32_t PortableWriterImpl::WriteMap(const char* fieldName, ignite::portable::MapType typ)
{
StartContainerSession(false);
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/portable/portable_containers.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/portable/portable_containers.cpp b/modules/platform/src/main/cpp/core/src/portable/portable_containers.cpp
index ade48b9..2d6e1d2 100644
--- a/modules/platform/src/main/cpp/core/src/portable/portable_containers.cpp
+++ b/modules/platform/src/main/cpp/core/src/portable/portable_containers.cpp
@@ -17,9 +17,9 @@
#include "gridgain/portable/portable_containers.h"
-using namespace gridgain::impl::portable;
+using namespace ignite::impl::portable;
-namespace gridgain
+namespace ignite
{
namespace portable
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/843fc30b/modules/platform/src/main/cpp/core/src/portable/portable_raw_reader.cpp
----------------------------------------------------------------------
diff --git a/modules/platform/src/main/cpp/core/src/portable/portable_raw_reader.cpp b/modules/platform/src/main/cpp/core/src/portable/portable_raw_reader.cpp
index 52840c8..e9809d6 100644
--- a/modules/platform/src/main/cpp/core/src/portable/portable_raw_reader.cpp
+++ b/modules/platform/src/main/cpp/core/src/portable/portable_raw_reader.cpp
@@ -17,9 +17,9 @@
#include "gridgain/impl/portable/portable_reader_impl.h"
#include "gridgain/portable/portable_raw_reader.h"
-using namespace gridgain::impl::portable;
+using namespace ignite::impl::portable;
-namespace gridgain
+namespace ignite
{
namespace portable
{