Mercurial > hg > orthanc

annotate OrthancFramework/Resources/Patches/boost-1.65.1-linux-standard-base.patch @ 4289:dd17d37ad950

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backporting a patch for DCMTK 3.6.5 to resolve a bad memory access in C-GET SCP
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 04 Nov 2020 18:34:44 +0100
parents d25f4c0fa160
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2448
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
1 diff -urEb boost_1_65_1.orig/boost/move/adl_move_swap.hpp boost_1_65_1/boost/move/adl_move_swap.hpp
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
2 --- boost_1_65_1.orig/boost/move/adl_move_swap.hpp 2017-11-08 17:43:20.000000000 +0100
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
3 +++ boost_1_65_1/boost/move/adl_move_swap.hpp 2018-01-02 15:34:48.829052917 +0100
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
4 @@ -28,6 +28,8 @@
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
5 //Try to avoid including <algorithm>, as it's quite big
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
6 #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB)
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
7 #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
8 +#elif defined(__LSB_VERSION__)
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
9 +# include <utility>
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
10 #elif defined(BOOST_GNU_STDLIB)
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
11 //For non-GCC compilers, where GNUC version is not very reliable, or old GCC versions
862d943115f9 working on linux standard base
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff changeset
12 //use the good old stl_algobase header, which is quite lightweight