Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7CD7817E35 for ; Mon, 2 Nov 2015 12:04:20 +0000 (UTC) Received: (qmail 32968 invoked by uid 500); 2 Nov 2015 12:04:20 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 32929 invoked by uid 500); 2 Nov 2015 12:04:20 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 32920 invoked by uid 99); 2 Nov 2015 12:04:20 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Nov 2015 12:04:20 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4C576DFBDE; Mon, 2 Nov 2015 12:04:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Mon, 02 Nov 2015 12:04:20 -0000 Message-Id: <038d34ec79ea4a6780c533fccaa21932@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ignite git commit: IGNITE-1282: Fixed compilation after faulty merge. Repository: ignite Updated Branches: refs/heads/ignite-1814 e225cab21 -> e08978a8f 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-1814 Commit: ce402cdcedc722bc1093452a9d46afd3a1d13283 Parents: 00c3a43 Author: vozerov-gridgain Authored: Mon Nov 2 12:17:13 2015 +0300 Committer: vozerov-gridgain 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 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++)