Mercurial > hg > orthanc
annotate OrthancFramework/Sources/Compatibility.h @ 4151:8c559dd5034b
Fix possible crash in HttpClient if sending multipart body (can occur in STOW-RS)
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 19 Aug 2020 11:59:02 +0200 |
parents | bf7b9edf6b81 |
children | 2007ab69ac16 |
rev | line source |
---|---|
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
1 /** |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
2 * Orthanc - A Lightweight, RESTful DICOM Store |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
3 * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
4 * Department, University Hospital of Liege, Belgium |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
5 * Copyright (C) 2017-2020 Osimis S.A., Belgium |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
6 * |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
7 * This program is free software: you can redistribute it and/or |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
8 * modify it under the terms of the GNU Lesser General Public License |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
9 * as published by the Free Software Foundation, either version 3 of |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
10 * the License, or (at your option) any later version. |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
11 * |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
12 * This program is distributed in the hope that it will be useful, but |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
13 * WITHOUT ANY WARRANTY; without even the implied warranty of |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
15 * Lesser General Public License for more details. |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
16 * |
4119
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
17 * You should have received a copy of the GNU Lesser General Public |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
18 * License along with this program. If not, see |
bf7b9edf6b81
re-licensing the OrthancFramework to LGPL, in order to license Stone of Orthanc under LGPL
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
4044
diff
changeset
|
19 * <http://www.gnu.org/licenses/>. |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
20 **/ |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
21 |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
22 |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
23 #pragma once |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
24 |
3728
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
25 //#define Orthanc_Compatibility_h_STR2(x) #x |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
26 //#define Orthanc_Compatibility_h_STR1(x) Orthanc_Compatibility_h_STR2(x) |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
27 |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
28 //#pragma message("__cplusplus = " Orthanc_Compatibility_h_STR1(__cplusplus)) |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
29 |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
30 #if (defined _MSC_VER) |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
31 //# pragma message("_MSC_VER = " Orthanc_Compatibility_h_STR1(_MSC_VER)) |
3732
6cd4b7724c3d
tentative fix of std::unique_ptr compilation issue for VS2015
Alain Mazy <alain@mazy.be>
parents:
3728
diff
changeset
|
32 //# pragma message("_MSVC_LANG = " Orthanc_Compatibility_h_STR1(_MSVC_LANG)) |
3728
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
33 // The __cplusplus macro cannot be used in Visual C++ < 1914 (VC++ 15.7) |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
34 // However, even in recent versions, __cplusplus will only be correct (that is, |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
35 // correctly defines the supported C++ version) if a special flag is passed to |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
36 // the compiler ("/Zc:__cplusplus") |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
37 // To make this header more robust, we use the _MSVC_LANG equivalent macro. |
3732
6cd4b7724c3d
tentative fix of std::unique_ptr compilation issue for VS2015
Alain Mazy <alain@mazy.be>
parents:
3728
diff
changeset
|
38 |
3733
c1550e710410
Better C++11 detection for Visual C++
Benjamin Golinvaux <bgo@osimis.io>
parents:
3732
diff
changeset
|
39 // please note that not all C++11 features are supported when _MSC_VER == 1600 |
c1550e710410
Better C++11 detection for Visual C++
Benjamin Golinvaux <bgo@osimis.io>
parents:
3732
diff
changeset
|
40 // (or higher). This header file can be made for fine-grained, if required, |
c1550e710410
Better C++11 detection for Visual C++
Benjamin Golinvaux <bgo@osimis.io>
parents:
3732
diff
changeset
|
41 // based on specific _MSC_VER values |
c1550e710410
Better C++11 detection for Visual C++
Benjamin Golinvaux <bgo@osimis.io>
parents:
3732
diff
changeset
|
42 |
c1550e710410
Better C++11 detection for Visual C++
Benjamin Golinvaux <bgo@osimis.io>
parents:
3732
diff
changeset
|
43 # if _MSC_VER >= 1600 |
3728
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
44 # define ORTHANC_Cxx03_DETECTED 0 |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
45 # else |
3714
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
46 # define ORTHANC_Cxx03_DETECTED 1 |
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
47 # endif |
3733
c1550e710410
Better C++11 detection for Visual C++
Benjamin Golinvaux <bgo@osimis.io>
parents:
3732
diff
changeset
|
48 |
3714
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
49 #else |
3728
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
50 // of _MSC_VER is not defined, we assume __cplusplus is correctly defined |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
51 // if __cplusplus is not defined (very old compilers??), then the following |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
52 // test will compare 0 < 201103L and will be true --> safe. |
3714
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
53 # if __cplusplus < 201103L |
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
54 # define ORTHANC_Cxx03_DETECTED 1 |
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
55 # else |
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
56 # define ORTHANC_Cxx03_DETECTED 0 |
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
57 # endif |
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
58 #endif |
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
59 |
3728
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
60 #if ORTHANC_Cxx03_DETECTED == 1 |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
61 //#pragma message("C++ 11 support is not present.") |
3714
e9029cb94d7c
fix unique_ptr cpp compat for MSVC
Alain Mazy <alain@mazy.be>
parents:
3712
diff
changeset
|
62 |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
63 /** |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
64 * "std::unique_ptr" was introduced in C++11, and "std::auto_ptr" was |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
65 * removed in C++17. We emulate "std::auto_ptr" using boost: "The |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
66 * smart pointer unique_ptr [is] a drop-in replacement for |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
67 * std::unique_ptr, usable also from C++03 compilers." This is only |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
68 * available if Boost >= 1.57.0 (from November 2014). |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
69 * https://www.boost.org/doc/libs/1_57_0/doc/html/move/reference.html#header.boost.move.unique_ptr_hpp |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
70 **/ |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
71 |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
72 #include <boost/move/unique_ptr.hpp> |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
73 |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
74 namespace std |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
75 { |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
76 template <typename T> |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
77 class unique_ptr : public boost::movelib::unique_ptr<T> |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
78 { |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
79 public: |
3751 | 80 explicit unique_ptr() : |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
81 boost::movelib::unique_ptr<T>() |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
82 { |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
83 } |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
84 |
3767 | 85 explicit unique_ptr(T* p) : |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
86 boost::movelib::unique_ptr<T>(p) |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
87 { |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
88 } |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
89 }; |
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
90 } |
3728
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
91 #else |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
92 //# pragma message("C++ 11 support is present.") |
0b3aacdf77f5
Fixed C++03 detection support for Visual C++ compilers
Benjamin Golinvaux <bgo@osimis.io>
parents:
3714
diff
changeset
|
93 # include <memory> |
3712
2a170a8f1faf
replacing std::auto_ptr by std::unique_ptr
Sebastien Jodogne <s.jodogne@gmail.com>
parents:
diff
changeset
|
94 #endif |