util: backport C++20 std::span and use it in various APIs
Implementation taken from span-lite by Martin Moene,
commit 337af6e23f6d3264136c16565546244da23159ba
Change-Id: Icfd0ba6841cbf6ef7870c31c881df940da9faf7e
diff --git a/tests/unit/security/transform/stream-sink.t.cpp b/tests/unit/security/transform/stream-sink.t.cpp
index 4704b01..f58bece 100644
--- a/tests/unit/security/transform/stream-sink.t.cpp
+++ b/tests/unit/security/transform/stream-sink.t.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2013-2018 Regents of the University of California.
+ * Copyright (c) 2013-2021 Regents of the University of California.
*
* This file is part of ndn-cxx library (NDN C++ library with eXperimental eXtensions).
*
@@ -34,20 +34,21 @@
BOOST_AUTO_TEST_CASE(Basic)
{
- uint8_t in[] = {
+ const uint8_t in[] = {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
- 0x20, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f
+ 0x20, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
};
std::ostringstream os;
StreamSink sink(os);
- BOOST_CHECK_EQUAL(sink.write(in, 4), 4);
- BOOST_CHECK_EQUAL(sink.write(in + 4, 4), 4);
- BOOST_CHECK_EQUAL(sink.write(in + 8, 4), 4);
- BOOST_CHECK_EQUAL(sink.write(in + 12, 4), 4);
+ BOOST_CHECK_EQUAL(sink.write({in, 4}), 4);
+ BOOST_CHECK_EQUAL(sink.write({in + 4, 4}), 4);
+ BOOST_CHECK_EQUAL(sink.write({in + 8, 4}), 4);
+ BOOST_CHECK_EQUAL(sink.write({in + 12, 4}), 4);
sink.end();
+
std::string out = os.str();
BOOST_CHECK_EQUAL_COLLECTIONS(in, in + sizeof(in), out.begin(), out.end());
- BOOST_CHECK_THROW(sink.write(in + 8, 8), transform::Error);
+ BOOST_CHECK_THROW(sink.write({in + 8, 8}), transform::Error);
}
BOOST_AUTO_TEST_SUITE_END() // TestStreamSink