You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/11/02 17:37:05 UTC
[22/33] ignite git commit: IGNITE-1282: Fixed compilation after
faulty merge.
IGNITE-1282: Fixed compilation after faulty merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce402cdc
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce402cdc
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce402cdc
Branch: refs/heads/ignite-1753-1282
Commit: ce402cdcedc722bc1093452a9d46afd3a1d13283
Parents: 00c3a43
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Mon Nov 2 12:17:13 2015 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Mon Nov 2 12:17:13 2015 +0300
----------------------------------------------------------------------
.../src/impl/portable/portable_reader_impl.cpp | 44 --------------------
1 file changed, 44 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce402cdc/modules/platforms/cpp/core/src/impl/portable/portable_reader_impl.cpp
----------------------------------------------------------------------
diff --git a/modules/platforms/cpp/core/src/impl/portable/portable_reader_impl.cpp b/modules/platforms/cpp/core/src/impl/portable/portable_reader_impl.cpp
index 644088b..96378e0 100644
--- a/modules/platforms/cpp/core/src/impl/portable/portable_reader_impl.cpp
+++ b/modules/platforms/cpp/core/src/impl/portable/portable_reader_impl.cpp
@@ -264,50 +264,6 @@ namespace ignite
return realLen;
}
- void PortableReaderImpl::ParseHeaderIfNeeded()
- {
- if (footerBegin)
- return;
-
- InteropStreamPositionGuard<InteropInputStream> posGuard(*stream);
-
- int8_t hdr = stream->ReadInt8();
-
- if (hdr != IGNITE_HDR_FULL)
- IGNITE_ERROR_2(ignite::IgniteError::IGNITE_ERR_PORTABLE, "Invalid header: ", hdr);
-
- int8_t protoVer = stream->ReadInt8();
-
- if (protoVer != IGNITE_PROTO_VER) {
- IGNITE_ERROR_2(ignite::IgniteError::IGNITE_ERR_PORTABLE,
- "Unsupported portable protocol version: ", protoVer);
- }
-
- int16_t flags = stream->ReadInt16();
- int32_t typeId = stream->ReadInt32();
- int32_t hashCode = stream->ReadInt32();
- int32_t len = stream->ReadInt32();
- int32_t schemaId = stream->ReadInt32();
- int32_t schemaOrRawOff = stream->ReadInt32();
-
- if (flags & IGNITE_PORTABLE_FLAG_RAW_ONLY)
- {
- footerBegin = len;
-
- rawOff = schemaOrRawOff;
- }
- else
- {
- footerBegin = schemaOrRawOff;
-
- rawOff = (len - footerBegin) % 8 ? stream->ReadInt32(pos + len - 4) : schemaOrRawOff;
- }
-
- footerEnd = len - ((len - footerBegin) % 8);
-
- bool usrType = flags & IGNITE_PORTABLE_FLAG_USER_OBJECT;
- }
-
void PortableReaderImpl::ReadGuidArrayInternal(InteropInputStream* stream, Guid* res, const int32_t len)
{
for (int i = 0; i < len; i++)