encoding: delete deprecated Block::fromBuffer and block helpers
These deprecated APIs are deleted:
Block::fromBuffer overloads with output parameter
ndn::encoding::prependBlock
ndn::encoding::prependByteArrayBlock
ndn::encoding::nonNegativeIntegerBlock
ndn::encoding::prependBooleanBlock
ndn::encoding::booleanBlock
ndn::encoding::dataBlock
ndn::encoding::nestedBlock
refs #2950, #2636
Change-Id: Ic7a129f340b75b4d97620bbf8f63d3ff2e9ddb03
diff --git a/src/encoding/block.hpp b/src/encoding/block.hpp
index 0c83149..7ade6e3 100644
--- a/src/encoding/block.hpp
+++ b/src/encoding/block.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/**
- * Copyright (c) 2013-2015 Regents of the University of California.
+ * Copyright (c) 2013-2016 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -147,17 +147,6 @@
static std::tuple<bool, Block>
fromBuffer(ConstBufferPtr buffer, size_t offset);
- /** @deprecated use fromBuffer(ConstBufferPtr, size_t)
- */
- DEPRECATED(
- static bool
- fromBuffer(const ConstBufferPtr& buffer, size_t offset, Block& block))
- {
- bool isOk = false;
- std::tie(isOk, block) = Block::fromBuffer(buffer, offset);
- return isOk;
- }
-
/** @brief Try to construct block from raw buffer
* @param buffer the raw buffer to copy bytes from
* @param maxSize the maximum size of constructed block;
@@ -171,17 +160,6 @@
static std::tuple<bool, Block>
fromBuffer(const uint8_t* buffer, size_t maxSize);
- /** @deprecated use fromBuffer(const uint8_t*, size_t)
- */
- DEPRECATED(
- static bool
- fromBuffer(const uint8_t* buffer, size_t maxSize, Block& block))
- {
- bool isOk = false;
- std::tie(isOk, block) = Block::fromBuffer(buffer, maxSize);
- return isOk;
- }
-
public: // wire format
/** @brief Check if the Block is empty
*/