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 2016/01/25 14:57:08 UTC
ignite git commit: IGNITE-1786: Minors: changing include/using order.
Repository: ignite
Updated Branches:
refs/heads/ignite-1786 d0736ca00 -> f7243aa99
IGNITE-1786: Minors: changing include/using order.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f7243aa9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f7243aa9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f7243aa9
Branch: refs/heads/ignite-1786
Commit: f7243aa99b689310071ce2143de3ede9b81a32b6
Parents: d0736ca
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Jan 25 16:56:53 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Jan 25 16:56:53 2016 +0300
----------------------------------------------------------------------
modules/platforms/cpp/core-test/src/cache_query_test.cpp | 1 +
modules/platforms/cpp/core/include/ignite/cache/cache.h | 2 +-
.../cpp/core/include/ignite/cache/query/query_cursor.h | 2 +-
.../cpp/core/include/ignite/cache/query/query_fields_cursor.h | 2 +-
.../cpp/core/include/ignite/cache/query/query_fields_row.h | 2 +-
modules/platforms/cpp/core/include/ignite/ignition.h | 3 ++-
.../include/ignite/impl/cache/query/query_fields_row_impl.h | 2 +-
.../cpp/core/include/ignite/impl/cache/query/query_impl.h | 1 +
modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h | 2 +-
modules/platforms/cpp/core/src/ignition.cpp | 6 +++---
modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp | 7 ++++---
11 files changed, 17 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core-test/src/cache_query_test.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core-test/src/cache_query_test.cpp b/modules/platforms/cpp/core-test/src/cache_query_test.cpp
index 3f645c6..71c1735 100644
--- a/modules/platforms/cpp/core-test/src/cache_query_test.cpp
+++ b/modules/platforms/cpp/core-test/src/cache_query_test.cpp
@@ -24,6 +24,7 @@
#include <boost/test/unit_test.hpp>
#include <ignite/common/utils.h>
+
#include "ignite/cache/cache.h"
#include "ignite/cache/query/query_cursor.h"
#include "ignite/cache/query/query_sql.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/include/ignite/cache/cache.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/cache.h b/modules/platforms/cpp/core/include/ignite/cache/cache.h
index 9cb1d71..2759818 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/cache.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/cache.h
@@ -28,6 +28,7 @@
#include <ignite/common/common.h>
#include <ignite/common/concurrent.h>
+#include <ignite/common/ignite_error.h>
#include "ignite/cache/cache_peek_mode.h"
#include "ignite/cache/query/query_cursor.h"
@@ -38,7 +39,6 @@
#include "ignite/cache/query/query_sql_fields.h"
#include "ignite/impl/cache/cache_impl.h"
#include "ignite/impl/operations.h"
-#include <ignite/common/ignite_error.h>
namespace ignite
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h
index 1d43d29..a73a90b 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_cursor.h
@@ -26,9 +26,9 @@
#include <vector>
#include <ignite/common/concurrent.h>
+#include <ignite/common/ignite_error.h>
#include "ignite/cache/cache_entry.h"
-#include <ignite/common/ignite_error.h>
#include "ignite/impl/cache/query/query_impl.h"
#include "ignite/impl/operations.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h
index d641c4f..a671f20 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_cursor.h
@@ -26,9 +26,9 @@
#include <vector>
#include <ignite/common/concurrent.h>
+#include <ignite/common/ignite_error.h>
#include "ignite/cache/cache_entry.h"
-#include <ignite/common/ignite_error.h>
#include "ignite/cache/query/query_fields_row.h"
#include "ignite/impl/cache/query/query_impl.h"
#include "ignite/impl/operations.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h b/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h
index 01bb352..58793a6 100644
--- a/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h
+++ b/modules/platforms/cpp/core/include/ignite/cache/query/query_fields_row.h
@@ -26,9 +26,9 @@
#include <vector>
#include <ignite/common/concurrent.h>
+#include <ignite/common/ignite_error.h>
#include "ignite/cache/cache_entry.h"
-#include <ignite/common/ignite_error.h>
#include "ignite/impl/cache/query/query_fields_row_impl.h"
#include "ignite/impl/operations.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/include/ignite/ignition.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/ignition.h b/modules/platforms/cpp/core/include/ignite/ignition.h
index 13d8b14..f38e4db 100644
--- a/modules/platforms/cpp/core/include/ignite/ignition.h
+++ b/modules/platforms/cpp/core/include/ignite/ignition.h
@@ -23,9 +23,10 @@
#ifndef _IGNITE_IGNITION
#define _IGNITE_IGNITION
+#include <ignite/common/ignite_error.h>
+
#include "ignite/ignite.h"
#include "ignite/ignite_configuration.h"
-#include <ignite/common/ignite_error.h>
namespace ignite
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_fields_row_impl.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_fields_row_impl.h b/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_fields_row_impl.h
index 84a6c25..704cc11 100644
--- a/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_fields_row_impl.h
+++ b/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_fields_row_impl.h
@@ -22,9 +22,9 @@
#include <memory>
#include <ignite/common/concurrent.h>
+#include <ignite/common/ignite_error.h>
#include "ignite/cache/cache_entry.h"
-#include <ignite/common/ignite_error.h>
#include "ignite/impl/cache/query/query_impl.h"
#include "ignite/impl/operations.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_impl.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_impl.h b/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_impl.h
index 9066e3b..a99030e 100644
--- a/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_impl.h
+++ b/modules/platforms/cpp/core/include/ignite/impl/cache/query/query_impl.h
@@ -19,6 +19,7 @@
#define _IGNITE_CACHE_QUERY_IMPL
#include <ignite/common/ignite_error.h>
+
#include "ignite/impl/ignite_environment.h"
#include "ignite/impl/operations.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h b/modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h
index 0c88a6f..f37f154 100644
--- a/modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h
+++ b/modules/platforms/cpp/core/include/ignite/impl/ignite_impl.h
@@ -20,10 +20,10 @@
#include <ignite/common/concurrent.h>
#include <ignite/common/java.h>
+#include <ignite/common/utils.h>
#include "ignite/impl/cache/cache_impl.h"
#include "ignite/impl/ignite_environment.h"
-#include <ignite/common/utils.h>
namespace ignite
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/src/ignition.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/src/ignition.cpp b/modules/platforms/cpp/core/src/ignition.cpp
index 9024dde..8cd26e8 100644
--- a/modules/platforms/cpp/core/src/ignition.cpp
+++ b/modules/platforms/cpp/core/src/ignition.cpp
@@ -21,16 +21,16 @@
#include <ignite/common/concurrent.h>
#include <ignite/common/exports.h>
#include <ignite/common/java.h>
+#include <ignite/common/utils.h>
+#include "ignite/ignition.h"
#include "ignite/impl/ignite_environment.h"
#include "ignite/impl/ignite_impl.h"
-#include <ignite/common/utils.h>
-#include "ignite/ignition.h"
using namespace ignite::common::concurrent;
using namespace ignite::common::java;
-using namespace ignite::impl;
using namespace ignite::common::utils;
+using namespace ignite::impl;
namespace ignite
{
http://git-wip-us.apache.org/repos/asf/ignite/blob/f7243aa9/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp b/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp
index a603778..231228d 100644
--- a/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp
+++ b/modules/platforms/cpp/core/src/impl/cache/cache_impl.cpp
@@ -15,23 +15,24 @@
* limitations under the License.
*/
+#include <ignite/common/utils.h>
+
#include "ignite/cache/cache_peek_mode.h"
#include "ignite/impl/cache/cache_impl.h"
#include "ignite/impl/interop/interop.h"
#include "ignite/impl/binary/binary_reader_impl.h"
-#include <ignite/common/utils.h>
#include "ignite/impl/binary/binary_type_updater_impl.h"
#include "ignite/binary/binary.h"
using namespace ignite::common::concurrent;
using namespace ignite::common::java;
+using namespace ignite::common::utils;
using namespace ignite::cache;
using namespace ignite::cache::query;
using namespace ignite::impl;
+using namespace ignite::impl::binary;
using namespace ignite::impl::cache::query;
using namespace ignite::impl::interop;
-using namespace ignite::impl::binary;
-using namespace ignite::common::utils;
using namespace ignite::binary;
namespace ignite