Mercurial > hg > orthanc
changeset 2931:89f2c302fc37
Fix issue #114
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 13 Nov 2018 17:50:03 +0100 |
| parents | 8341256c6941 |
| children | 00504dcc996f 4a38d7d4f0e0 |
| files | Core/Toolbox.cpp NEWS |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/Toolbox.cpp Tue Nov 13 16:21:13 2018 +0100 +++ b/Core/Toolbox.cpp Tue Nov 13 17:50:03 2018 +0100 @@ -40,8 +40,13 @@ #include <boost/algorithm/string/case_conv.hpp> #include <boost/algorithm/string/replace.hpp> #include <boost/lexical_cast.hpp> -#include <boost/regex.hpp> -#include <boost/uuid/sha1.hpp> +#include <boost/regex.hpp> + +#if BOOST_VERSION >= 106600 +# include <boost/uuid/detail/sha1.hpp> +#else +# include <boost/uuid/sha1.hpp> +#endif #include <string> #include <stdint.h> @@ -51,6 +56,8 @@ #if ORTHANC_ENABLE_MD5 == 1 +// TODO - Could be replaced by <boost/uuid/detail/md5.hpp> starting +// with Boost >= 1.66.0 # include "../Resources/ThirdParty/md5/md5.h" #endif
--- a/NEWS Tue Nov 13 16:21:13 2018 +0100 +++ b/NEWS Tue Nov 13 17:50:03 2018 +0100 @@ -33,6 +33,7 @@ * Remove invalid characters from badly-encoded UTF-8 strings (impacts PostgreSQL) * Orthanc starts even if jobs from a previous execution cannot be unserialized * New CMake option "ENABLE_DCMTK_LOG" to disable logging internal to DCMTK +* Fix issue 114 (Boost 1.68 doesn't support SHA-1 anymore) * Upgraded dependencies for static and Windows builds: - boost 1.68.0