ci: compile-check installed headers
Script copied from ndn-cxx with minor modifications
Also, move tlv.hpp to detail/ and cleanup includes in common.hpp
Change-Id: I6240601f005c61bb3547bd5acf854200f3b13093
diff --git a/src/detail/bzip2-helper.cpp b/src/detail/bzip2-helper.cpp
index 0784b7f..4c5617e 100644
--- a/src/detail/bzip2-helper.cpp
+++ b/src/detail/bzip2-helper.cpp
@@ -17,12 +17,13 @@
* ChronoSync, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
*/
-#include "detail/bzip2-helper.hpp"
+#include "bzip2-helper.hpp"
-#include <boost/iostreams/filtering_stream.hpp>
-#include <boost/iostreams/detail/iostream.hpp>
-#include <boost/iostreams/filter/bzip2.hpp>
#include <boost/iostreams/copy.hpp>
+#include <boost/iostreams/device/array.hpp>
+#include <boost/iostreams/filtering_stream.hpp>
+#include <boost/iostreams/filter/bzip2.hpp>
+#include <boost/iostreams/stream.hpp>
#include <ndn-cxx/encoding/buffer-stream.hpp>
@@ -38,7 +39,7 @@
bio::filtering_stream<bio::output> out;
out.push(bio::bzip2_compressor());
out.push(os);
- bio::stream<bio::array_source> in(reinterpret_cast<const char*>(buffer), bufferSize);
+ bio::stream<bio::array_source> in(buffer, bufferSize);
bio::copy(in, out);
return os.buf();
}
@@ -50,7 +51,7 @@
bio::filtering_stream<bio::output> out;
out.push(bio::bzip2_decompressor());
out.push(os);
- bio::stream<bio::array_source> in(reinterpret_cast<const char*>(buffer), bufferSize);
+ bio::stream<bio::array_source> in(buffer, bufferSize);
bio::copy(in, out);
return os.buf();
}
diff --git a/src/detail/common.hpp b/src/detail/common.hpp
index 4e9e4cd..dffd218 100644
--- a/src/detail/common.hpp
+++ b/src/detail/common.hpp
@@ -23,7 +23,7 @@
#ifndef CHRONOSYNC_DETAIL_COMMON_HPP
#define CHRONOSYNC_DETAIL_COMMON_HPP
-#include "detail/config.hpp"
+#include "config.hpp"
#ifdef CHRONOSYNC_WITH_TESTS
#define CHRONOSYNC_VIRTUAL_WITH_TESTS virtual
@@ -38,11 +38,10 @@
#endif
#include <cstddef>
-#include <list>
-#include <queue>
+#include <functional>
+#include <memory>
#include <set>
#include <vector>
-#include <tuple>
#include <ndn-cxx/data.hpp>
#include <ndn-cxx/face.hpp>
@@ -55,22 +54,19 @@
#include <ndn-cxx/util/time.hpp>
#include <boost/algorithm/string.hpp>
-#include <boost/asio.hpp>
#include <boost/assert.hpp>
#include <boost/core/noncopyable.hpp>
#include <boost/lexical_cast.hpp>
namespace chronosync {
-using std::size_t;
-
using boost::noncopyable;
+using std::size_t;
+
using std::bind;
-using std::cref;
using std::function;
using std::make_shared;
-using std::make_tuple;
using std::ref;
using std::shared_ptr;
@@ -79,17 +75,12 @@
using ndn::Data;
using ndn::Interest;
using ndn::Name;
-using ndn::security::ValidationError;
using ndn::security::Validator;
-
-namespace tlv {
-using namespace ndn::tlv;
-} // namespace tlv
+using ndn::security::ValidationError;
namespace name = ndn::name;
namespace time = ndn::time;
namespace security = ndn::security;
-namespace encoding = ndn::encoding;
} // namespace chronosync
diff --git a/src/detail/tlv.hpp b/src/detail/tlv.hpp
new file mode 100644
index 0000000..5f9bd31
--- /dev/null
+++ b/src/detail/tlv.hpp
@@ -0,0 +1,41 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2012-2021 University of California, Los Angeles
+ *
+ * This file is part of ChronoSync, synchronization library for distributed realtime
+ * applications for NDN.
+ *
+ * ChronoSync is free software: you can redistribute it and/or modify it under the terms
+ * of the GNU General Public License as published by the Free Software Foundation, either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * ChronoSync is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+ * PURPOSE. See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along with
+ * ChronoSync, e.g., in COPYING.md file. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * @author Yingdi Yu <yingdi@cs.ucla.edu>
+ */
+
+#ifndef CHRONOSYNC_DETAIL_TLV_HPP
+#define CHRONOSYNC_DETAIL_TLV_HPP
+
+namespace chronosync {
+namespace tlv {
+
+/**
+ * @brief Type value of sync reply related TLVs
+ * @sa docs/design.rst
+ */
+enum {
+ SyncReply = 128, // 0x80
+ StateLeaf = 129, // 0x81
+ SeqNo = 130, // 0x82
+};
+
+} // namespace tlv
+} // namespace chronosync
+
+#endif // CHRONOSYNC_DETAIL_TLV_HPP