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 12:55:50 UTC
[48/50] ignite git commit: IGNITE-1786: Initial review - binaries.
IGNITE-1786: Initial review - binaries.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a26dfb33
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a26dfb33
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a26dfb33
Branch: refs/heads/ignite-1786
Commit: a26dfb3323c7f2dd77f90236d0725189cc8e1177
Parents: ad3de1c
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Jan 25 14:38:51 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Jan 25 14:38:51 2016 +0300
----------------------------------------------------------------------
.../platforms/cpp/binary/include/ignite/impl/interop/interop.h | 6 +++---
.../ignite/impl/interop/interop_stream_position_guard.h | 1 +
modules/platforms/cpp/binary/src/binary/binary_raw_reader.cpp | 3 ++-
modules/platforms/cpp/binary/src/binary/binary_reader.cpp | 3 ++-
.../cpp/binary/src/impl/binary/binary_reader_impl.cpp | 3 ++-
.../cpp/binary/src/impl/binary/binary_writer_impl.cpp | 3 ++-
.../cpp/binary/src/impl/interop/interop_input_stream.cpp | 3 ++-
.../platforms/cpp/binary/src/impl/interop/interop_memory.cpp | 2 +-
.../cpp/binary/src/impl/interop/interop_output_stream.cpp | 3 ++-
9 files changed, 17 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h
index 6279630..da4fdb9 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop.h
@@ -18,8 +18,8 @@
#ifndef _IGNITE_IMPL_INTEROP
#define _IGNITE_IMPL_INTEROP
-#include "ignite/impl/interop//interop_memory.h"
-#include "ignite/impl/interop//interop_output_stream.h"
-#include "ignite/impl/interop//interop_input_stream.h"
+#include "ignite/impl/interop/interop_memory.h"
+#include "ignite/impl/interop/interop_output_stream.h"
+#include "ignite/impl/interop/interop_input_stream.h"
#endif
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h
index 92b835f..a1c6e8a 100644
--- a/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h
+++ b/modules/platforms/cpp/binary/include/ignite/impl/interop/interop_stream_position_guard.h
@@ -18,6 +18,7 @@
#ifndef _IGNITE_IMPL_INTEROP_STREAM_POSITION_GUARD
#define _IGNITE_IMPL_INTEROP_OUTPUT_POSITION_GUARD
+/// TODO: Consider replacing NULL with 0 and removing header.
#include <cstddef>
#include "ignite/impl/interop/interop_memory.h"
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/src/binary/binary_raw_reader.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/src/binary/binary_raw_reader.cpp b/modules/platforms/cpp/binary/src/binary/binary_raw_reader.cpp
index 61105e0..093c13f 100644
--- a/modules/platforms/cpp/binary/src/binary/binary_raw_reader.cpp
+++ b/modules/platforms/cpp/binary/src/binary/binary_raw_reader.cpp
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "ignite/impl/binary/binary_reader_impl.h"
+
#include "ignite/binary/binary_raw_reader.h"
+#include "ignite/impl/binary/binary_reader_impl.h"
using namespace ignite::impl::binary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/src/binary/binary_reader.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/src/binary/binary_reader.cpp b/modules/platforms/cpp/binary/src/binary/binary_reader.cpp
index b3fe4ee..005ec13 100644
--- a/modules/platforms/cpp/binary/src/binary/binary_reader.cpp
+++ b/modules/platforms/cpp/binary/src/binary/binary_reader.cpp
@@ -14,8 +14,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "ignite/impl/binary/binary_reader_impl.h"
+
#include "ignite/binary/binary_reader.h"
+#include "ignite/impl/binary/binary_reader_impl.h"
using namespace ignite::impl::binary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/src/impl/binary/binary_reader_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/src/impl/binary/binary_reader_impl.cpp b/modules/platforms/cpp/binary/src/impl/binary/binary_reader_impl.cpp
index 107fd8a..b33be8e 100644
--- a/modules/platforms/cpp/binary/src/impl/binary/binary_reader_impl.cpp
+++ b/modules/platforms/cpp/binary/src/impl/binary/binary_reader_impl.cpp
@@ -15,6 +15,8 @@
* limitations under the License.
*/
+#include <ignite/common/ignite_error.h>
+
#include "ignite/impl/interop/interop.h"
#include "ignite/impl/interop/interop_stream_position_guard.h"
#include "ignite/impl/binary/binary_common.h"
@@ -22,7 +24,6 @@
#include "ignite/impl/binary/binary_reader_impl.h"
#include "ignite/impl/binary/binary_utils.h"
#include "ignite/binary/binary_type.h"
-#include <ignite/common/ignite_error.h>
using namespace ignite::impl::interop;
using namespace ignite::impl::binary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/src/impl/binary/binary_writer_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/src/impl/binary/binary_writer_impl.cpp b/modules/platforms/cpp/binary/src/impl/binary/binary_writer_impl.cpp
index 8971e79..97aff17 100644
--- a/modules/platforms/cpp/binary/src/impl/binary/binary_writer_impl.cpp
+++ b/modules/platforms/cpp/binary/src/impl/binary/binary_writer_impl.cpp
@@ -15,9 +15,10 @@
* limitations under the License.
*/
+#include <ignite/common/ignite_error.h>
+
#include "ignite/impl/binary/binary_writer_impl.h"
#include "ignite/impl/interop/interop_stream_position_guard.h"
-#include <ignite/common/ignite_error.h>
using namespace ignite::impl::interop;
using namespace ignite::impl::binary;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/src/impl/interop/interop_input_stream.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/src/impl/interop/interop_input_stream.cpp b/modules/platforms/cpp/binary/src/impl/interop/interop_input_stream.cpp
index 4f8443c..e62f15d 100644
--- a/modules/platforms/cpp/binary/src/impl/interop/interop_input_stream.cpp
+++ b/modules/platforms/cpp/binary/src/impl/interop/interop_input_stream.cpp
@@ -17,9 +17,10 @@
#include <cstring>
-#include "ignite/impl/interop//interop_input_stream.h"
#include <ignite/common/ignite_error.h>
+#include "ignite/impl/interop//interop_input_stream.h"
+
/**
* Common macro to read a single value.
*/
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/src/impl/interop/interop_memory.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/src/impl/interop/interop_memory.cpp b/modules/platforms/cpp/binary/src/impl/interop/interop_memory.cpp
index db83373..c9cf662 100644
--- a/modules/platforms/cpp/binary/src/impl/interop/interop_memory.cpp
+++ b/modules/platforms/cpp/binary/src/impl/interop/interop_memory.cpp
@@ -15,10 +15,10 @@
* limitations under the License.
*/
+#include <ignite/common/ignite_error.h>
#include <ignite/common/java.h>
#include "ignite/impl/interop//interop_memory.h"
-#include <ignite/common/ignite_error.h>
using namespace ignite::common::java;
http://git-wip-us.apache.org/repos/asf/ignite/blob/a26dfb33/modules/platforms/cpp/binary/src/impl/interop/interop_output_stream.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/binary/src/impl/interop/interop_output_stream.cpp b/modules/platforms/cpp/binary/src/impl/interop/interop_output_stream.cpp
index 0b905af..efa2989 100644
--- a/modules/platforms/cpp/binary/src/impl/interop/interop_output_stream.cpp
+++ b/modules/platforms/cpp/binary/src/impl/interop/interop_output_stream.cpp
@@ -17,9 +17,10 @@
#include <cstring>
-#include "ignite/impl/interop//interop_output_stream.h"
#include <ignite/common/ignite_error.h>
+#include "ignite/impl/interop//interop_output_stream.h"
+
/**
* Common macro to write a single value.
*/