diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-07-28 19:41:50 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2015-07-28 19:41:50 +0100 |
| commit | 0b8014d0d015c28062e904f65573cde51c6677c9 (patch) | |
| tree | a4afc5ff31e7527c106afd893b9ba8f50bc0d4f7 | |
| parent | Visibility hidden (diff) | |
| download | project2-0b8014d0d015c28062e904f65573cde51c6677c9.tar.bz2 project2-0b8014d0d015c28062e904f65573cde51c6677c9.tar.xz project2-0b8014d0d015c28062e904f65573cde51c6677c9.zip | |
Explicit conversion for boost-1.57 compatproject2-1.1.4.4
| -rw-r--r-- | project2/common/options.h | 2 | ||||
| -rw-r--r-- | project2/files/presenterCache.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/project2/common/options.h b/project2/common/options.h index 3a7a28b..0d90826 100644 --- a/project2/common/options.h +++ b/project2/common/options.h @@ -73,7 +73,7 @@ class Options { TargetPtr value(T * t, const D & d = D(), typename boost::disable_if<std::is_convertible<VariableType, T>, dummy>::type = 0) { return new InstanceTarget( - [t](const VariableType & v) { *t = v; }, + [t](const VariableType & v) { *t = v.as<std::string>(); }, [t, d]() { *t = d; }); } diff --git a/project2/files/presenterCache.cpp b/project2/files/presenterCache.cpp index 897c85b..3fbe1f6 100644 --- a/project2/files/presenterCache.cpp +++ b/project2/files/presenterCache.cpp @@ -202,7 +202,7 @@ class FilePresenterCache : public PresenterCache { { boost::filesystem::path cache; cache = Store; - cache /= idProvider->value(ec); + cache /= idProvider->value(ec).as<std::string>(); boost::filesystem::create_directories(cache); cache /= FileName; return cache; |