1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,24 @@ |
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/system.hpp instead. |
|
8 |
+ */ |
|
9 |
+ |
|
10 |
+#ifndef BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
+#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
12 |
+ |
|
13 |
+#include <boost/config/header_deprecated.hpp> |
|
14 |
+ |
|
15 |
+BOOST_HEADER_DEPRECATED("<boost/winapi/system.hpp>") |
|
16 |
+ |
|
17 |
+#include <boost/winapi/system.hpp> |
|
18 |
+#include <boost/detail/winapi/detail/deprecated_namespace.hpp> |
|
19 |
+ |
|
20 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
21 |
+#pragma once |
|
22 |
+#endif |
|
23 |
+ |
|
24 |
+#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |
1 | 1 |
deleted file mode 100755 |
... | ... |
@@ -1,24 +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/system.hpp instead. |
|
8 |
- */ |
|
9 |
- |
|
10 |
-#ifndef BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
-#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
12 |
- |
|
13 |
-#include <boost/config/header_deprecated.hpp> |
|
14 |
- |
|
15 |
-BOOST_HEADER_DEPRECATED("<boost/winapi/system.hpp>") |
|
16 |
- |
|
17 |
-#include <boost/winapi/system.hpp> |
|
18 |
-#include <boost/detail/winapi/detail/deprecated_namespace.hpp> |
|
19 |
- |
|
20 |
-#ifdef BOOST_HAS_PRAGMA_ONCE |
|
21 |
-#pragma once |
|
22 |
-#endif |
|
23 |
- |
|
24 |
-#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |
1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,24 @@ |
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/system.hpp instead. |
|
8 |
+ */ |
|
9 |
+ |
|
10 |
+#ifndef BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
+#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
12 |
+ |
|
13 |
+#include <boost/config/header_deprecated.hpp> |
|
14 |
+ |
|
15 |
+BOOST_HEADER_DEPRECATED("<boost/winapi/system.hpp>") |
|
16 |
+ |
|
17 |
+#include <boost/winapi/system.hpp> |
|
18 |
+#include <boost/detail/winapi/detail/deprecated_namespace.hpp> |
|
19 |
+ |
|
20 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
21 |
+#pragma once |
|
22 |
+#endif |
|
23 |
+ |
|
24 |
+#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |
From: Steffen Neumann <sneumann@ipb-halle.de>
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@125184 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
deleted file mode 100644 |
... | ... |
@@ -1,52 +0,0 @@ |
1 |
-// system.hpp --------------------------------------------------------------// |
|
2 |
- |
|
3 |
-// Copyright 2010 Vicente J. Botet Escriba |
|
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_SYSTEM_HPP |
|
10 |
-#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
- |
|
12 |
-#include <boost/detail/winapi/basic_types.hpp> |
|
13 |
- |
|
14 |
-#ifdef BOOST_HAS_PRAGMA_ONCE |
|
15 |
-#pragma once |
|
16 |
-#endif |
|
17 |
- |
|
18 |
-namespace boost { |
|
19 |
-namespace detail { |
|
20 |
-namespace winapi { |
|
21 |
-#if defined( BOOST_USE_WINDOWS_H ) |
|
22 |
- typedef ::SYSTEM_INFO SYSTEM_INFO_; |
|
23 |
- extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *); |
|
24 |
-#else |
|
25 |
-extern "C" { |
|
26 |
- typedef struct _SYSTEM_INFO { |
|
27 |
- union { |
|
28 |
- DWORD_ dwOemId; |
|
29 |
- struct { |
|
30 |
- WORD_ wProcessorArchitecture; |
|
31 |
- WORD_ wReserved; |
|
32 |
- } dummy; |
|
33 |
- } ; |
|
34 |
- DWORD_ dwPageSize; |
|
35 |
- LPVOID_ lpMinimumApplicationAddress; |
|
36 |
- LPVOID_ lpMaximumApplicationAddress; |
|
37 |
- DWORD_PTR_ dwActiveProcessorMask; |
|
38 |
- DWORD_ dwNumberOfProcessors; |
|
39 |
- DWORD_ dwProcessorType; |
|
40 |
- DWORD_ dwAllocationGranularity; |
|
41 |
- WORD_ wProcessorLevel; |
|
42 |
- WORD_ wProcessorRevision; |
|
43 |
- } SYSTEM_INFO_; |
|
44 |
- |
|
45 |
- __declspec(dllimport) void __stdcall |
|
46 |
- GetSystemInfo (struct system_info *); |
|
47 |
-} |
|
48 |
-#endif |
|
49 |
-} |
|
50 |
-} |
|
51 |
-} |
|
52 |
-#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |
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,62 +1,52 @@ |
1 |
-// system.hpp --------------------------------------------------------------// |
|
2 |
- |
|
3 |
-// Copyright 2010 Vicente J. Botet Escriba |
|
4 |
-// Copyright (c) Microsoft Corporation 2014 |
|
5 |
- |
|
6 |
-// Distributed under the Boost Software License, Version 1.0. |
|
7 |
-// See http://www.boost.org/LICENSE_1_0.txt |
|
8 |
- |
|
9 |
- |
|
10 |
-#ifndef BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
-#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
12 |
- |
|
13 |
-#include <boost/detail/winapi/basic_types.hpp> |
|
14 |
- |
|
15 |
-#ifdef BOOST_HAS_PRAGMA_ONCE |
|
16 |
-#pragma once |
|
17 |
-#endif |
|
18 |
- |
|
19 |
-namespace boost { |
|
20 |
-namespace detail { |
|
21 |
-namespace winapi { |
|
22 |
-#if defined( BOOST_USE_WINDOWS_H ) |
|
23 |
- typedef ::SYSTEM_INFO SYSTEM_INFO_; |
|
24 |
-# if BOOST_USE_WINAPI_VERSION < BOOST_WINAPI_VERSION_WINXP |
|
25 |
-extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *); |
|
26 |
-# else |
|
27 |
-extern "C" __declspec(dllimport) void __stdcall GetNativeSystemInfo (struct system_info *); |
|
28 |
-# endif |
|
29 |
-#else |
|
30 |
-extern "C" { |
|
31 |
- typedef struct _SYSTEM_INFO { |
|
32 |
- union { |
|
33 |
- DWORD_ dwOemId; |
|
34 |
- struct { |
|
35 |
- WORD_ wProcessorArchitecture; |
|
36 |
- WORD_ wReserved; |
|
37 |
- } dummy; |
|
38 |
- } ; |
|
39 |
- DWORD_ dwPageSize; |
|
40 |
- LPVOID_ lpMinimumApplicationAddress; |
|
41 |
- LPVOID_ lpMaximumApplicationAddress; |
|
42 |
- DWORD_PTR_ dwActiveProcessorMask; |
|
43 |
- DWORD_ dwNumberOfProcessors; |
|
44 |
- DWORD_ dwProcessorType; |
|
45 |
- DWORD_ dwAllocationGranularity; |
|
46 |
- WORD_ wProcessorLevel; |
|
47 |
- WORD_ wProcessorRevision; |
|
48 |
- } SYSTEM_INFO_; |
|
49 |
- |
|
50 |
-# if BOOST_USE_WINAPI_VERSION < BOOST_WINAPI_VERSION_WINXP |
|
51 |
- __declspec(dllimport) void __stdcall |
|
52 |
- GetSystemInfo (struct system_info *); |
|
53 |
-# else |
|
54 |
- __declspec(dllimport) void __stdcall |
|
55 |
- GetNativeSystemInfo (struct system_info *); |
|
56 |
-# endif |
|
57 |
-} |
|
58 |
-#endif |
|
59 |
-} |
|
60 |
-} |
|
61 |
-} |
|
62 |
-#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
1 |
+// system.hpp --------------------------------------------------------------// |
|
2 |
+ |
|
3 |
+// Copyright 2010 Vicente J. Botet Escriba |
|
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_SYSTEM_HPP |
|
10 |
+#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
+ |
|
12 |
+#include <boost/detail/winapi/basic_types.hpp> |
|
13 |
+ |
|
14 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
15 |
+#pragma once |
|
16 |
+#endif |
|
17 |
+ |
|
18 |
+namespace boost { |
|
19 |
+namespace detail { |
|
20 |
+namespace winapi { |
|
21 |
+#if defined( BOOST_USE_WINDOWS_H ) |
|
22 |
+ typedef ::SYSTEM_INFO SYSTEM_INFO_; |
|
23 |
+ extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *); |
|
24 |
+#else |
|
25 |
+extern "C" { |
|
26 |
+ typedef struct _SYSTEM_INFO { |
|
27 |
+ union { |
|
28 |
+ DWORD_ dwOemId; |
|
29 |
+ struct { |
|
30 |
+ WORD_ wProcessorArchitecture; |
|
31 |
+ WORD_ wReserved; |
|
32 |
+ } dummy; |
|
33 |
+ } ; |
|
34 |
+ DWORD_ dwPageSize; |
|
35 |
+ LPVOID_ lpMinimumApplicationAddress; |
|
36 |
+ LPVOID_ lpMaximumApplicationAddress; |
|
37 |
+ DWORD_PTR_ dwActiveProcessorMask; |
|
38 |
+ DWORD_ dwNumberOfProcessors; |
|
39 |
+ DWORD_ dwProcessorType; |
|
40 |
+ DWORD_ dwAllocationGranularity; |
|
41 |
+ WORD_ wProcessorLevel; |
|
42 |
+ WORD_ wProcessorRevision; |
|
43 |
+ } SYSTEM_INFO_; |
|
44 |
+ |
|
45 |
+ __declspec(dllimport) void __stdcall |
|
46 |
+ GetSystemInfo (struct system_info *); |
|
47 |
+} |
|
48 |
+#endif |
|
49 |
+} |
|
50 |
+} |
|
51 |
+} |
|
52 |
+#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |
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,52 +1,62 @@ |
1 |
-// system.hpp --------------------------------------------------------------// |
|
2 |
- |
|
3 |
-// Copyright 2010 Vicente J. Botet Escriba |
|
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_SYSTEM_HPP |
|
10 |
-#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
- |
|
12 |
-#include <boost/detail/winapi/basic_types.hpp> |
|
13 |
- |
|
14 |
-#ifdef BOOST_HAS_PRAGMA_ONCE |
|
15 |
-#pragma once |
|
16 |
-#endif |
|
17 |
- |
|
18 |
-namespace boost { |
|
19 |
-namespace detail { |
|
20 |
-namespace winapi { |
|
21 |
-#if defined( BOOST_USE_WINDOWS_H ) |
|
22 |
- typedef ::SYSTEM_INFO SYSTEM_INFO_; |
|
23 |
- extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *); |
|
24 |
-#else |
|
25 |
-extern "C" { |
|
26 |
- typedef struct _SYSTEM_INFO { |
|
27 |
- union { |
|
28 |
- DWORD_ dwOemId; |
|
29 |
- struct { |
|
30 |
- WORD_ wProcessorArchitecture; |
|
31 |
- WORD_ wReserved; |
|
32 |
- } dummy; |
|
33 |
- } ; |
|
34 |
- DWORD_ dwPageSize; |
|
35 |
- LPVOID_ lpMinimumApplicationAddress; |
|
36 |
- LPVOID_ lpMaximumApplicationAddress; |
|
37 |
- DWORD_PTR_ dwActiveProcessorMask; |
|
38 |
- DWORD_ dwNumberOfProcessors; |
|
39 |
- DWORD_ dwProcessorType; |
|
40 |
- DWORD_ dwAllocationGranularity; |
|
41 |
- WORD_ wProcessorLevel; |
|
42 |
- WORD_ wProcessorRevision; |
|
43 |
- } SYSTEM_INFO_; |
|
44 |
- |
|
45 |
- __declspec(dllimport) void __stdcall |
|
46 |
- GetSystemInfo (struct system_info *); |
|
47 |
-} |
|
48 |
-#endif |
|
49 |
-} |
|
50 |
-} |
|
51 |
-} |
|
52 |
-#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
1 |
+// system.hpp --------------------------------------------------------------// |
|
2 |
+ |
|
3 |
+// Copyright 2010 Vicente J. Botet Escriba |
|
4 |
+// Copyright (c) Microsoft Corporation 2014 |
|
5 |
+ |
|
6 |
+// Distributed under the Boost Software License, Version 1.0. |
|
7 |
+// See http://www.boost.org/LICENSE_1_0.txt |
|
8 |
+ |
|
9 |
+ |
|
10 |
+#ifndef BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
+#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
12 |
+ |
|
13 |
+#include <boost/detail/winapi/basic_types.hpp> |
|
14 |
+ |
|
15 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
16 |
+#pragma once |
|
17 |
+#endif |
|
18 |
+ |
|
19 |
+namespace boost { |
|
20 |
+namespace detail { |
|
21 |
+namespace winapi { |
|
22 |
+#if defined( BOOST_USE_WINDOWS_H ) |
|
23 |
+ typedef ::SYSTEM_INFO SYSTEM_INFO_; |
|
24 |
+# if BOOST_USE_WINAPI_VERSION < BOOST_WINAPI_VERSION_WINXP |
|
25 |
+extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *); |
|
26 |
+# else |
|
27 |
+extern "C" __declspec(dllimport) void __stdcall GetNativeSystemInfo (struct system_info *); |
|
28 |
+# endif |
|
29 |
+#else |
|
30 |
+extern "C" { |
|
31 |
+ typedef struct _SYSTEM_INFO { |
|
32 |
+ union { |
|
33 |
+ DWORD_ dwOemId; |
|
34 |
+ struct { |
|
35 |
+ WORD_ wProcessorArchitecture; |
|
36 |
+ WORD_ wReserved; |
|
37 |
+ } dummy; |
|
38 |
+ } ; |
|
39 |
+ DWORD_ dwPageSize; |
|
40 |
+ LPVOID_ lpMinimumApplicationAddress; |
|
41 |
+ LPVOID_ lpMaximumApplicationAddress; |
|
42 |
+ DWORD_PTR_ dwActiveProcessorMask; |
|
43 |
+ DWORD_ dwNumberOfProcessors; |
|
44 |
+ DWORD_ dwProcessorType; |
|
45 |
+ DWORD_ dwAllocationGranularity; |
|
46 |
+ WORD_ wProcessorLevel; |
|
47 |
+ WORD_ wProcessorRevision; |
|
48 |
+ } SYSTEM_INFO_; |
|
49 |
+ |
|
50 |
+# if BOOST_USE_WINAPI_VERSION < BOOST_WINAPI_VERSION_WINXP |
|
51 |
+ __declspec(dllimport) void __stdcall |
|
52 |
+ GetSystemInfo (struct system_info *); |
|
53 |
+# else |
|
54 |
+ __declspec(dllimport) void __stdcall |
|
55 |
+ GetNativeSystemInfo (struct system_info *); |
|
56 |
+# endif |
|
57 |
+} |
|
58 |
+#endif |
|
59 |
+} |
|
60 |
+} |
|
61 |
+} |
|
62 |
+#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@90759 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,52 @@ |
1 |
+// system.hpp --------------------------------------------------------------// |
|
2 |
+ |
|
3 |
+// Copyright 2010 Vicente J. Botet Escriba |
|
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_SYSTEM_HPP |
|
10 |
+#define BOOST_DETAIL_WINAPI_SYSTEM_HPP |
|
11 |
+ |
|
12 |
+#include <boost/detail/winapi/basic_types.hpp> |
|
13 |
+ |
|
14 |
+#ifdef BOOST_HAS_PRAGMA_ONCE |
|
15 |
+#pragma once |
|
16 |
+#endif |
|
17 |
+ |
|
18 |
+namespace boost { |
|
19 |
+namespace detail { |
|
20 |
+namespace winapi { |
|
21 |
+#if defined( BOOST_USE_WINDOWS_H ) |
|
22 |
+ typedef ::SYSTEM_INFO SYSTEM_INFO_; |
|
23 |
+ extern "C" __declspec(dllimport) void __stdcall GetSystemInfo (struct system_info *); |
|
24 |
+#else |
|
25 |
+extern "C" { |
|
26 |
+ typedef struct _SYSTEM_INFO { |
|
27 |
+ union { |
|
28 |
+ DWORD_ dwOemId; |
|
29 |
+ struct { |
|
30 |
+ WORD_ wProcessorArchitecture; |
|
31 |
+ WORD_ wReserved; |
|
32 |
+ } dummy; |
|
33 |
+ } ; |
|
34 |
+ DWORD_ dwPageSize; |
|
35 |
+ LPVOID_ lpMinimumApplicationAddress; |
|
36 |
+ LPVOID_ lpMaximumApplicationAddress; |
|
37 |
+ DWORD_PTR_ dwActiveProcessorMask; |
|
38 |
+ DWORD_ dwNumberOfProcessors; |
|
39 |
+ DWORD_ dwProcessorType; |
|
40 |
+ DWORD_ dwAllocationGranularity; |
|
41 |
+ WORD_ wProcessorLevel; |
|
42 |
+ WORD_ wProcessorRevision; |
|
43 |
+ } SYSTEM_INFO_; |
|
44 |
+ |
|
45 |
+ __declspec(dllimport) void __stdcall |
|
46 |
+ GetSystemInfo (struct system_info *); |
|
47 |
+} |
|
48 |
+#endif |
|
49 |
+} |
|
50 |
+} |
|
51 |
+} |
|
52 |
+#endif // BOOST_DETAIL_WINAPI_SYSTEM_HPP |