Mercurial > hg > orthanc
comparison Core/Toolbox.cpp @ 2931:89f2c302fc37
Fix issue #114
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Tue, 13 Nov 2018 17:50:03 +0100 |
parents | 0bcf46cea4e4 |
children | d924f9bb61cc |
comparison
equal
deleted
inserted
replaced
2930:8341256c6941 | 2931:89f2c302fc37 |
---|---|
38 #include "Logging.h" | 38 #include "Logging.h" |
39 | 39 |
40 #include <boost/algorithm/string/case_conv.hpp> | 40 #include <boost/algorithm/string/case_conv.hpp> |
41 #include <boost/algorithm/string/replace.hpp> | 41 #include <boost/algorithm/string/replace.hpp> |
42 #include <boost/lexical_cast.hpp> | 42 #include <boost/lexical_cast.hpp> |
43 #include <boost/regex.hpp> | 43 #include <boost/regex.hpp> |
44 #include <boost/uuid/sha1.hpp> | 44 |
45 #if BOOST_VERSION >= 106600 | |
46 # include <boost/uuid/detail/sha1.hpp> | |
47 #else | |
48 # include <boost/uuid/sha1.hpp> | |
49 #endif | |
45 | 50 |
46 #include <string> | 51 #include <string> |
47 #include <stdint.h> | 52 #include <stdint.h> |
48 #include <string.h> | 53 #include <string.h> |
49 #include <algorithm> | 54 #include <algorithm> |
50 #include <ctype.h> | 55 #include <ctype.h> |
51 | 56 |
52 | 57 |
53 #if ORTHANC_ENABLE_MD5 == 1 | 58 #if ORTHANC_ENABLE_MD5 == 1 |
59 // TODO - Could be replaced by <boost/uuid/detail/md5.hpp> starting | |
60 // with Boost >= 1.66.0 | |
54 # include "../Resources/ThirdParty/md5/md5.h" | 61 # include "../Resources/ThirdParty/md5/md5.h" |
55 #endif | 62 #endif |
56 | 63 |
57 #if ORTHANC_ENABLE_BASE64 == 1 | 64 #if ORTHANC_ENABLE_BASE64 == 1 |
58 # include "../Resources/ThirdParty/base64/base64.h" | 65 # include "../Resources/ThirdParty/base64/base64.h" |