commit 36d7d4ec923b48c28177e232e100312a1bff6885
parent 1f83a420deff4ed49d62e2c309fc260325a9e9c7
Author: cfillion <cfillion@users.noreply.github.com>
Date: Wed, 13 Dec 2017 23:05:33 -0500
partially fix build under Ubuntu 14.4 (GCC 7)
I haven't replaced Boost's 5.56+'s value_or to gev_value_or because the
semantic is slightly different.
Apply this to make it build with Boost 5.55:
sed -i s/value_or/get_value_or/ src/*.cpp
Diffstat:
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/manager.cpp b/src/manager.cpp
@@ -596,19 +596,19 @@ bool Manager::apply()
set<Remote> syncList;
if(m_autoInstall) {
- g_reapack->config()->install.autoInstall = m_autoInstall.value();
+ g_reapack->config()->install.autoInstall = *m_autoInstall;
- if(m_autoInstall.value()) {
+ if(*m_autoInstall) {
const auto &enabledNow = g_reapack->config()->remotes.getEnabled();
copy(enabledNow.begin(), enabledNow.end(), inserter(syncList, syncList.end()));
}
}
if(m_bleedingEdge)
- g_reapack->config()->install.bleedingEdge = m_bleedingEdge.value();
+ g_reapack->config()->install.bleedingEdge = *m_bleedingEdge;
if(m_promptObsolete)
- g_reapack->config()->install.promptObsolete = m_promptObsolete.value();
+ g_reapack->config()->install.promptObsolete = *m_promptObsolete;
for(const auto &pair : m_mods) {
Remote remote = pair.first;
diff --git a/src/receipt.hpp b/src/receipt.hpp
@@ -21,6 +21,7 @@
#include "registry.hpp"
#include "errors.hpp"
+#include <memory>
#include <set>
#include <sstream>
#include <vector>
diff --git a/src/registry.cpp b/src/registry.cpp
@@ -23,6 +23,8 @@
#include "path.hpp"
#include "remote.hpp"
+#include <algorithm>
+
#include <sqlite3.h>
using namespace std;
diff --git a/src/task.hpp b/src/task.hpp
@@ -23,6 +23,7 @@
#include "registry.hpp"
#include "remote.hpp"
+#include <memory>
#include <set>
#include <unordered_set>
#include <vector>