hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge branch 'feature/library_intermediate' into feature/library_intermediate2

Browse Source
This commit is contained in:
Sebastian Messmer 2018-12-25 10:43:07 +01:00
commit 7868acad1a
4 changed files with 218 additions and 211 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
.circleci/config.yml
View File

@ -90,12 +90,12 @@ references:
restore_cache:
keys:
# Find the most recent cache from any branch
- v3_upgrade_boost_cache_{{ checksum "/tmp/_build_env_vars" }}_{{ arch }}
- v4_upgrade_boost_cache_{{ checksum "/tmp/_build_env_vars" }}_{{ arch }}
upgrade_boost_post: &upgrade_boost_post
save_cache:
key: v3_upgrade_boost_cache_{{ checksum "/tmp/_build_env_vars" }}_{{ arch }}
key: v4_upgrade_boost_cache_{{ checksum "/tmp/_build_env_vars" }}_{{ arch }}
paths:
- /tmp/boost_1_57_0
- /tmp/boost_1_58_0
upgrade_boost: &upgrade_boost
run:
name: Upgrade Boost
@ -104,10 +104,10 @@ references:
export NUMCORES=`nproc`
echo Using $NUMCORES cores
# Download and prepare boost (only if not already present from cache)
if [ ! -d "/tmp/boost_1_57_0" ]; then
if [ ! -d "/tmp/boost_1_58_0" ]; then
echo "Didn't find boost in cache. Downloading and building."
wget -O /tmp/boost.tar.bz2 https://sourceforge.net/projects/boost/files/boost/1.57.0/boost_1_57_0.tar.bz2/download
if [ $(sha512sum /tmp/boost.tar.bz2 | awk '{print $1;}') == "61881440fd89644c43c6e3bc6292e9fed75a6d3a76f98654b189d0ed4e1087d77b585884e882270c08bf9f7132b173bfc1fde05848e06aa78ba7f1008d10714d" ]; then
wget -O /tmp/boost.tar.bz2 https://sourceforge.net/projects/boost/files/boost/1.58.0/boost_1_58_0.tar.bz2/download
if [ $(sha512sum /tmp/boost.tar.bz2 | awk '{print $1;}') == "7480ec713b0aa13f0ec990603e87e3b5c8d53f4411329b10fae37fc963b90aad12dbd9290a33c3669ae801e9012a68683eadff057591e9ca2ebcd22b1a67b5d1" ]; then
echo Correct sha512sum
else
echo Wrong sha512sum
@ -117,14 +117,14 @@ references:
echo Extracting...
tar -xf /tmp/boost.tar.bz2 -C /tmp
rm -rf boost.tar.bz2
cd /tmp/boost_1_57_0
cd /tmp/boost_1_58_0
./bootstrap.sh --with-toolset=${BUILD_TOOLSET} --with-libraries=filesystem,thread,chrono,program_options
cd ..
else
echo Found boost in cache. Use cache and build.
fi
# Compile and install boost (if cached, this should be fast)
cd /tmp/boost_1_57_0
cd /tmp/boost_1_58_0
sudo ./b2 toolset=${BUILD_TOOLSET} link=static cxxflags=-fPIC -d0 -j$NUMCORES install
build_pre: &build_pre
restore_cache:

2
README.md
View File

@ -26,7 +26,7 @@ Requirements
- GCC version >= 5.0 or Clang >= 4.0
- CMake version >= 3.0
- libcurl4 (including development headers)
- Boost libraries version >= 1.57 (including development headers)
- Boost libraries version >= 1.58 (including development headers)
- filesystem
- system
- chrono

4
cmake-utils/utils.cmake
View File

@ -108,7 +108,7 @@ endfunction(target_enable_style_warnings)
function(target_add_boost TARGET)
# Load boost libraries
if(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
# Many supported systems don't have boost >= 1.57. Better link it statically.
# Many supported systems don't have boost >= 1.58. Better link it statically.
message(STATUS "Boost will be statically linked")
set(Boost_USE_STATIC_LIBS ON)
else(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
@ -116,7 +116,7 @@ function(target_add_boost TARGET)
set(Boost_USE_STATIC_LIBS OFF)
endif(NOT DEFINED Boost_USE_STATIC_LIBS OR Boost_USE_STATIC_LIBS)
set(BOOST_THREAD_VERSION 4)
find_package(Boost 1.57.0
find_package(Boost 1.58.0
REQUIRED
COMPONENTS ${ARGN})
target_include_directories(${TARGET} SYSTEM PUBLIC ${Boost_INCLUDE_DIRS})

51
src/cpp-utils/either.h
View File

@ -8,9 +8,9 @@
namespace cpputils {
template<class Left, class Right>
class either final {
public:
template<class Left, class Right>
class either final {
public:
template<class Head, class... Tail, std::enable_if_t<std::is_constructible<Left, Head, Tail...>::value && !std::is_constructible<Right, Head, Tail...>::value>* = nullptr>
either(Head&& construct_left_head_arg, Tail&&... construct_left_tail_args) noexcept(noexcept(std::declval<either<Left, Right>>()._construct_left(std::forward<Head>(construct_left_head_arg), std::forward<Tail>(construct_left_tail_args)...)))
: _side(Side::left) {
@ -80,7 +80,9 @@ public:
}
const Left &left() const& {
ASSERT(is_left(), "Tried to get left side of an either which is right.");
if (!is_left()) {
throw std::logic_error("Tried to get left side of an either which is right.");
}
return _left;
}
Left &left() & {
@ -91,7 +93,9 @@ public:
}
const Right &right() const& {
ASSERT(is_right(), "Tried to get right side of an either which is left.");
if (!is_right()) {
throw std::logic_error("Tried to get right side of an either which is left.");
}
return _right;
}
Right &right() & {
@ -124,6 +128,7 @@ public:
}
}
boost::optional<const Right&> right_opt() const& noexcept {
if (_side == Side::right) {
return _right;
@ -147,7 +152,9 @@ public:
}
}
private:
private:
union {
Left _left;
Right _right;
@ -177,10 +184,10 @@ private:
template<typename Left_, typename Right_, typename... Args>
friend either<Left_, Right_> make_right(Args&&... args) /* TODO noexcept(noexcept(std::declval<either<Left, Right>>()._construct_right(std::forward<Args>(args)...))) */;
};
};
template<class Left, class Right>
inline bool operator==(const either<Left, Right> &lhs, const either<Left, Right> &rhs) noexcept(noexcept(std::declval<Left>() == std::declval<Left>()) && noexcept(std::declval<Right>() == std::declval<Right>())) {
template<class Left, class Right>
inline bool operator==(const either<Left, Right> &lhs, const either<Left, Right> &rhs) noexcept(noexcept(std::declval<Left>() == std::declval<Left>()) && noexcept(std::declval<Right>() == std::declval<Right>())) {
if (lhs.is_left() != rhs.is_left()) {
return false;
}
@ -189,36 +196,36 @@ inline bool operator==(const either<Left, Right> &lhs, const either<Left, Right>
} else {
return lhs.right() == rhs.right();
}
}
}
template<class Left, class Right>
inline bool operator!=(const either<Left, Right> &lhs, const either<Left, Right> &rhs) noexcept(noexcept(operator==(lhs, rhs))) {
template<class Left, class Right>
inline bool operator!=(const either<Left, Right> &lhs, const either<Left, Right> &rhs) noexcept(noexcept(operator==(lhs, rhs))) {
return !operator==(lhs, rhs);
}
}
template<class Left, class Right>
inline std::ostream &operator<<(std::ostream &stream, const either<Left, Right> &value) {
template<class Left, class Right>
inline std::ostream &operator<<(std::ostream &stream, const either<Left, Right> &value) {
if (value.is_left()) {
stream << "Left(" << value.left() << ")";
} else {
stream << "Right(" << value.right() << ")";
}
return stream;
}
}
template<typename Left, typename Right, typename... Args>
inline either<Left, Right> make_left(Args&&... args) /* TODO noexcept(noexcept(std::declval<either<Left, Right>>()._construct_left(std::forward<Args>(args)...))) */ {
template<typename Left, typename Right, typename... Args>
inline either<Left, Right> make_left(Args&&... args) /* TODO noexcept(noexcept(std::declval<either<Left, Right>>()._construct_left(std::forward<Args>(args)...))) */ {
either<Left, Right> result(either<Left, Right>::Side::left);
result._construct_left(std::forward<Args>(args)...);
return result;
}
}
template<typename Left, typename Right, typename... Args>
inline either<Left, Right> make_right(Args&&... args) /* TODO noexcept(noexcept(std::declval<either<Left, Right>>()._construct_right(std::forward<Args>(args)...))) */ {
template<typename Left, typename Right, typename... Args>
inline either<Left, Right> make_right(Args&&... args) /* TODO noexcept(noexcept(std::declval<either<Left, Right>>()._construct_right(std::forward<Args>(args)...))) */ {
either<Left, Right> result(either<Left, Right>::Side::right);
result._construct_right(std::forward<Args>(args)...);
return result;
}
}
}