1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,23 @@ |
1 |
+/* |
|
2 |
+ * Copyright 2017 Andrey Semashev |
|
3 |
+ * |
|
4 |
+ * Distributed under the Boost Software License, Version 1.0. |
|
5 |
+ * See http://www.boost.org/LICENSE_1_0.txt |
|
6 |
+ * |
|
7 |
+ * This header is deprecated, use boost/winapi/config.hpp instead. |
|
8 |
+ */ |
|
9 |
+ |
|
10 |
+#ifndef BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
11 |
+#define BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
12 |
+ |
|
13 |
+#include <boost/config/header_deprecated.hpp> |
|
14 |
+ |
|
15 |
+BOOST_HEADER_DEPRECATED("<boost/winapi/config.hpp>") |
|
16 |
+ |
|
17 |
+#include <boost/winapi/config.hpp> |
|
18 |
+ |
|
19 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
20 |
+#pragma once |
|
21 |
+#endif |
|
22 |
+ |
|
23 |
+#endif // BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
1 | 1 |
deleted file mode 100755 |
... | ... |
@@ -1,23 +0,0 @@ |
1 |
-/* |
|
2 |
- * Copyright 2017 Andrey Semashev |
|
3 |
- * |
|
4 |
- * Distributed under the Boost Software License, Version 1.0. |
|
5 |
- * See http://www.boost.org/LICENSE_1_0.txt |
|
6 |
- * |
|
7 |
- * This header is deprecated, use boost/winapi/config.hpp instead. |
|
8 |
- */ |
|
9 |
- |
|
10 |
-#ifndef BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
11 |
-#define BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
12 |
- |
|
13 |
-#include <boost/config/header_deprecated.hpp> |
|
14 |
- |
|
15 |
-BOOST_HEADER_DEPRECATED("<boost/winapi/config.hpp>") |
|
16 |
- |
|
17 |
-#include <boost/winapi/config.hpp> |
|
18 |
- |
|
19 |
-#ifdef BOOST_HAS_PRAGMA_ONCE |
|
20 |
-#pragma once |
|
21 |
-#endif |
|
22 |
- |
|
23 |
-#endif // BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,23 @@ |
1 |
+/* |
|
2 |
+ * Copyright 2017 Andrey Semashev |
|
3 |
+ * |
|
4 |
+ * Distributed under the Boost Software License, Version 1.0. |
|
5 |
+ * See http://www.boost.org/LICENSE_1_0.txt |
|
6 |
+ * |
|
7 |
+ * This header is deprecated, use boost/winapi/config.hpp instead. |
|
8 |
+ */ |
|
9 |
+ |
|
10 |
+#ifndef BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
11 |
+#define BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
12 |
+ |
|
13 |
+#include <boost/config/header_deprecated.hpp> |
|
14 |
+ |
|
15 |
+BOOST_HEADER_DEPRECATED("<boost/winapi/config.hpp>") |
|
16 |
+ |
|
17 |
+#include <boost/winapi/config.hpp> |
|
18 |
+ |
|
19 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
20 |
+#pragma once |
|
21 |
+#endif |
|
22 |
+ |
|
23 |
+#endif // BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
From: Laurent <lg390@cam.ac.uk>
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@125180 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,53 +0,0 @@ |
1 |
-// config.hpp --------------------------------------------------------------// |
|
2 |
- |
|
3 |
-// Copyright 2013 Andrey Semashev |
|
4 |
- |
|
5 |
-// Distributed under the Boost Software License, Version 1.0. |
|
6 |
-// See http://www.boost.org/LICENSE_1_0.txt |
|
7 |
- |
|
8 |
- |
|
9 |
-#ifndef BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
10 |
-#define BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
11 |
- |
|
12 |
-#include <boost/config.hpp> |
|
13 |
- |
|
14 |
-#ifdef BOOST_HAS_PRAGMA_ONCE |
|
15 |
-#pragma once |
|
16 |
-#endif |
|
17 |
- |
|
18 |
-// These constants reflect _WIN32_WINNT_* macros from sdkddkver.h |
|
19 |
-// See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745%28v=vs.85%29.aspx#setting_winver_or__win32_winnt |
|
20 |
-#define BOOST_WINAPI_VERSION_NT4 0x0400 |
|
21 |
-#define BOOST_WINAPI_VERSION_WIN2K 0x0500 |
|
22 |
-#define BOOST_WINAPI_VERSION_WINXP 0x0501 |
|
23 |
-#define BOOST_WINAPI_VERSION_WS03 0x0502 |
|
24 |
-#define BOOST_WINAPI_VERSION_WIN6 0x0600 |
|
25 |
-#define BOOST_WINAPI_VERSION_VISTA 0x0600 |
|
26 |
-#define BOOST_WINAPI_VERSION_WS08 0x0600 |
|
27 |
-#define BOOST_WINAPI_VERSION_LONGHORN 0x0600 |
|
28 |
-#define BOOST_WINAPI_VERSION_WIN7 0x0601 |
|
29 |
-#define BOOST_WINAPI_VERSION_WIN8 0x0602 |
|
30 |
-#define BOOST_WINAPI_VERSION_WINBLUE 0x0603 |
|
31 |
- |
|
32 |
-#if !defined(BOOST_USE_WINAPI_VERSION) |
|
33 |
-#if defined(_WIN32_WINNT) |
|
34 |
-#define BOOST_USE_WINAPI_VERSION _WIN32_WINNT |
|
35 |
-#elif defined(WINVER) |
|
36 |
-#define BOOST_USE_WINAPI_VERSION WINVER |
|
37 |
-#else |
|
38 |
-// By default use Windows XP API |
|
39 |
-#define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WINXP |
|
40 |
-#endif |
|
41 |
-#endif |
|
42 |
- |
|
43 |
-#if defined(BOOST_USE_WINDOWS_H) |
|
44 |
-// We have to define the version macros so that windows.h provides the necessary symbols |
|
45 |
-#if !defined(_WIN32_WINNT) |
|
46 |
-#define _WIN32_WINNT BOOST_USE_WINAPI_VERSION |
|
47 |
-#endif |
|
48 |
-#if !defined(WINVER) |
|
49 |
-#define WINVER BOOST_USE_WINAPI_VERSION |
|
50 |
-#endif |
|
51 |
-#endif |
|
52 |
- |
|
53 |
-#endif // BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
Commit id: 0b3d4d9bb71e3ca5891b777610fc8dec103a6d61
Bumped version after KK's updates
Commit id: 9e04409b64757a177893d56c0300904f31945cb1
modified: src/pwiz/data/common/BinaryIndexStream.cpp modified: src/win/i386/libpwiz.a modified: src/win/x64/libpwiz.a
Commit id: f16b04258dc20bf3315beac99708e11728cfc12b
update precompiled lib for windows
Commit id: 5d56197f1148378d92e89b2d0a167e18c4b7ab2e
Bump version, tame .Rbuildignore
Commit id: 432da5bd294c9b87f7761e15bc814c3785c21abf
Merge remote-tracking branch 'origin/boost_159'
Commit id: 92be978bf72d90c2222a19ddf365f6d1acc9f20d
upadte Makevars
Commit id: ae75037a780cead56c4d20bedf822c94fb413677
upgrade to boost 1.5.9
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@110126 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,53 @@ |
1 |
+// config.hpp --------------------------------------------------------------// |
|
2 |
+ |
|
3 |
+// Copyright 2013 Andrey Semashev |
|
4 |
+ |
|
5 |
+// Distributed under the Boost Software License, Version 1.0. |
|
6 |
+// See http://www.boost.org/LICENSE_1_0.txt |
|
7 |
+ |
|
8 |
+ |
|
9 |
+#ifndef BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
10 |
+#define BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |
|
11 |
+ |
|
12 |
+#include <boost/config.hpp> |
|
13 |
+ |
|
14 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
15 |
+#pragma once |
|
16 |
+#endif |
|
17 |
+ |
|
18 |
+// These constants reflect _WIN32_WINNT_* macros from sdkddkver.h |
|
19 |
+// See also: http://msdn.microsoft.com/en-us/library/windows/desktop/aa383745%28v=vs.85%29.aspx#setting_winver_or__win32_winnt |
|
20 |
+#define BOOST_WINAPI_VERSION_NT4 0x0400 |
|
21 |
+#define BOOST_WINAPI_VERSION_WIN2K 0x0500 |
|
22 |
+#define BOOST_WINAPI_VERSION_WINXP 0x0501 |
|
23 |
+#define BOOST_WINAPI_VERSION_WS03 0x0502 |
|
24 |
+#define BOOST_WINAPI_VERSION_WIN6 0x0600 |
|
25 |
+#define BOOST_WINAPI_VERSION_VISTA 0x0600 |
|
26 |
+#define BOOST_WINAPI_VERSION_WS08 0x0600 |
|
27 |
+#define BOOST_WINAPI_VERSION_LONGHORN 0x0600 |
|
28 |
+#define BOOST_WINAPI_VERSION_WIN7 0x0601 |
|
29 |
+#define BOOST_WINAPI_VERSION_WIN8 0x0602 |
|
30 |
+#define BOOST_WINAPI_VERSION_WINBLUE 0x0603 |
|
31 |
+ |
|
32 |
+#if !defined(BOOST_USE_WINAPI_VERSION) |
|
33 |
+#if defined(_WIN32_WINNT) |
|
34 |
+#define BOOST_USE_WINAPI_VERSION _WIN32_WINNT |
|
35 |
+#elif defined(WINVER) |
|
36 |
+#define BOOST_USE_WINAPI_VERSION WINVER |
|
37 |
+#else |
|
38 |
+// By default use Windows XP API |
|
39 |
+#define BOOST_USE_WINAPI_VERSION BOOST_WINAPI_VERSION_WINXP |
|
40 |
+#endif |
|
41 |
+#endif |
|
42 |
+ |
|
43 |
+#if defined(BOOST_USE_WINDOWS_H) |
|
44 |
+// We have to define the version macros so that windows.h provides the necessary symbols |
|
45 |
+#if !defined(_WIN32_WINNT) |
|
46 |
+#define _WIN32_WINNT BOOST_USE_WINAPI_VERSION |
|
47 |
+#endif |
|
48 |
+#if !defined(WINVER) |
|
49 |
+#define WINVER BOOST_USE_WINAPI_VERSION |
|
50 |
+#endif |
|
51 |
+#endif |
|
52 |
+ |
|
53 |
+#endif // BOOST_DETAIL_WINAPI_CONFIG_HPP_INCLUDED_ |