Mercurial > hg > orthanc

comparison Resources/Patches/glog-visual-studio-port.h @ 1111:929bf8c2123d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixes for Visual Studio 2013 64bit
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 01 Sep 2014 11:23:13 +0200
parents f25c79497739
children
comparison
equal deleted inserted replaced
1110:becde5351e47 1111:929bf8c2123d
56 #include <string.h> /* for _strnicmp(), strerror_s() */ 56 #include <string.h> /* for _strnicmp(), strerror_s() */
57 #include <time.h> /* for localtime_s() */ 57 #include <time.h> /* for localtime_s() */
58 /* Note: the C++ #includes are all together at the bottom. This file is 58 /* Note: the C++ #includes are all together at the bottom. This file is
59 * used by both C and C++ code, so we put all the C++ together. 59 * used by both C and C++ code, so we put all the C++ together.
60 */ 60 */
61
62 // Fix by Sebastien Jodogne for Visual Studio 2013
63 // https://code.google.com/p/google-glog/issues/detail?id=212
64 #if defined(_MSC_VER) && (_MSC_VER >= 1800)
65 #include <algorithm>
66 #endif
61 67
62 /* 4244: otherwise we get problems when substracting two size_t's to an int 68 /* 4244: otherwise we get problems when substracting two size_t's to an int
63 * 4251: it's complaining about a private struct I've chosen not to dllexport 69 * 4251: it's complaining about a private struct I've chosen not to dllexport
64 * 4355: we use this in a constructor, but we do it safely 70 * 4355: we use this in a constructor, but we do it safely
65 * 4715: for some reason VC++ stopped realizing you can't return after abort() 71 * 4715: for some reason VC++ stopped realizing you can't return after abort()