generic-library/valijson
1
0
Fork 0
mirror of https://github.com/tristanpenman/valijson.git synced 2024-12-12 18:20:27 +01:00
Code Issues Projects Releases Wiki Activity

Fix compatibility with boost 1.56+

Browse Source 
In boost 1.56 the optional library is no longer happy with the implicit
conversion from boost::optional<std::string> to bool, so we get the following
errors:

    valijson/include/valijson/schema.hpp:177:16: error: no viable conversion from 'const boost::optional<std::string>' to 'bool'
            return id;
                   ^~

    valijson/include/valijson/schema.hpp:188:16: error: no viable conversion from 'const boost::optional<std::string>' to 'bool'
                    return title;
                           ^~~~~
    2 errors generated.

Here we explicitly test against boost::none instead.
This commit is contained in:
Richard Clamp 2014-11-26 13:50:51 +00:00
parent 467368d022
commit 2ac5d96852
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/valijson/schema.hpp
View File

@ -174,7 +174,7 @@ public:
*/ */
bool hasId() const bool hasId() const
{ {
return id; return id != boost::none;
} }
/** /**
@ -185,7 +185,7 @@ public:
*/ */
bool hasTitle() const bool hasTitle() const
{ {
return title; return title != boost::none;
} }
std::string resolveUri(const std::string &relative) const std::string resolveUri(const std::string &relative) const