1 | 1 |
new file mode 100755 |
... | ... |
@@ -0,0 +1,20 @@ |
1 |
+// (C) Copyright Beman Dawes 2000. Distributed under the Boost |
|
2 |
+// Software License, Version 1.0. (See accompanying file |
|
3 |
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
|
4 |
+ |
|
5 |
+#ifndef BOOST_ITERATOR_HPP |
|
6 |
+#define BOOST_ITERATOR_HPP |
|
7 |
+ |
|
8 |
+// This header is obsolete and will be deprecated. |
|
9 |
+ |
|
10 |
+#include <iterator> |
|
11 |
+#include <cstddef> // std::ptrdiff_t |
|
12 |
+ |
|
13 |
+namespace boost |
|
14 |
+{ |
|
15 |
+ |
|
16 |
+using std::iterator; |
|
17 |
+ |
|
18 |
+} // namespace boost |
|
19 |
+ |
|
20 |
+#endif // BOOST_ITERATOR_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,59 +0,0 @@ |
1 |
-// iterator.hpp workarounds for non-conforming standard libraries ---------// |
|
2 |
- |
|
3 |
-// (C) Copyright Beman Dawes 2000. Distributed under the Boost |
|
4 |
-// Software License, Version 1.0. (See accompanying file |
|
5 |
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
|
6 |
- |
|
7 |
-// See http://www.boost.org/libs/utility for documentation. |
|
8 |
- |
|
9 |
-// Revision History |
|
10 |
-// 12 Jan 01 added <cstddef> for std::ptrdiff_t (Jens Maurer) |
|
11 |
-// 28 Jun 00 Workarounds to deal with known MSVC bugs (David Abrahams) |
|
12 |
-// 26 Jun 00 Initial version (Jeremy Siek) |
|
13 |
- |
|
14 |
-#ifndef BOOST_ITERATOR_HPP |
|
15 |
-#define BOOST_ITERATOR_HPP |
|
16 |
- |
|
17 |
-#include <iterator> |
|
18 |
-#include <cstddef> // std::ptrdiff_t |
|
19 |
-#include <boost/config.hpp> |
|
20 |
- |
|
21 |
-namespace boost |
|
22 |
-{ |
|
23 |
-# if defined(BOOST_NO_STD_ITERATOR) && !defined(BOOST_MSVC_STD_ITERATOR) |
|
24 |
- template <class Category, class T, |
|
25 |
- class Distance = std::ptrdiff_t, |
|
26 |
- class Pointer = T*, class Reference = T&> |
|
27 |
- struct iterator |
|
28 |
- { |
|
29 |
- typedef T value_type; |
|
30 |
- typedef Distance difference_type; |
|
31 |
- typedef Pointer pointer; |
|
32 |
- typedef Reference reference; |
|
33 |
- typedef Category iterator_category; |
|
34 |
- }; |
|
35 |
-# else |
|
36 |
- |
|
37 |
- // declare iterator_base in namespace detail to work around MSVC bugs which |
|
38 |
- // prevent derivation from an identically-named class in a different namespace. |
|
39 |
- namespace detail { |
|
40 |
- template <class Category, class T, class Distance, class Pointer, class Reference> |
|
41 |
-# if !defined(BOOST_MSVC_STD_ITERATOR) |
|
42 |
- struct iterator_base : std::iterator<Category, T, Distance, Pointer, Reference> {}; |
|
43 |
-# else |
|
44 |
- struct iterator_base : std::iterator<Category, T, Distance> |
|
45 |
- { |
|
46 |
- typedef Reference reference; |
|
47 |
- typedef Pointer pointer; |
|
48 |
- typedef Distance difference_type; |
|
49 |
- }; |
|
50 |
-# endif |
|
51 |
- } |
|
52 |
- |
|
53 |
- template <class Category, class T, class Distance = std::ptrdiff_t, |
|
54 |
- class Pointer = T*, class Reference = T&> |
|
55 |
- struct iterator : boost::detail::iterator_base<Category, T, Distance, Pointer, Reference> {}; |
|
56 |
-# endif |
|
57 |
-} // namespace boost |
|
58 |
- |
|
59 |
-#endif // BOOST_ITERATOR_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,20 +1,59 @@ |
1 |
-// (C) Copyright Beman Dawes 2000. Distributed under the Boost |
|
2 |
-// Software License, Version 1.0. (See accompanying file |
|
3 |
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
|
4 |
- |
|
5 |
-#ifndef BOOST_ITERATOR_HPP |
|
6 |
-#define BOOST_ITERATOR_HPP |
|
7 |
- |
|
8 |
-// This header is obsolete and will be deprecated. |
|
9 |
- |
|
10 |
-#include <iterator> |
|
11 |
-#include <cstddef> // std::ptrdiff_t |
|
12 |
- |
|
13 |
-namespace boost |
|
14 |
-{ |
|
15 |
- |
|
16 |
-using std::iterator; |
|
17 |
- |
|
18 |
-} // namespace boost |
|
19 |
- |
|
20 |
-#endif // BOOST_ITERATOR_HPP |
|
1 |
+// iterator.hpp workarounds for non-conforming standard libraries ---------// |
|
2 |
+ |
|
3 |
+// (C) Copyright Beman Dawes 2000. Distributed under the Boost |
|
4 |
+// Software License, Version 1.0. (See accompanying file |
|
5 |
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
|
6 |
+ |
|
7 |
+// See http://www.boost.org/libs/utility for documentation. |
|
8 |
+ |
|
9 |
+// Revision History |
|
10 |
+// 12 Jan 01 added <cstddef> for std::ptrdiff_t (Jens Maurer) |
|
11 |
+// 28 Jun 00 Workarounds to deal with known MSVC bugs (David Abrahams) |
|
12 |
+// 26 Jun 00 Initial version (Jeremy Siek) |
|
13 |
+ |
|
14 |
+#ifndef BOOST_ITERATOR_HPP |
|
15 |
+#define BOOST_ITERATOR_HPP |
|
16 |
+ |
|
17 |
+#include <iterator> |
|
18 |
+#include <cstddef> // std::ptrdiff_t |
|
19 |
+#include <boost/config.hpp> |
|
20 |
+ |
|
21 |
+namespace boost |
|
22 |
+{ |
|
23 |
+# if defined(BOOST_NO_STD_ITERATOR) && !defined(BOOST_MSVC_STD_ITERATOR) |
|
24 |
+ template <class Category, class T, |
|
25 |
+ class Distance = std::ptrdiff_t, |
|
26 |
+ class Pointer = T*, class Reference = T&> |
|
27 |
+ struct iterator |
|
28 |
+ { |
|
29 |
+ typedef T value_type; |
|
30 |
+ typedef Distance difference_type; |
|
31 |
+ typedef Pointer pointer; |
|
32 |
+ typedef Reference reference; |
|
33 |
+ typedef Category iterator_category; |
|
34 |
+ }; |
|
35 |
+# else |
|
36 |
+ |
|
37 |
+ // declare iterator_base in namespace detail to work around MSVC bugs which |
|
38 |
+ // prevent derivation from an identically-named class in a different namespace. |
|
39 |
+ namespace detail { |
|
40 |
+ template <class Category, class T, class Distance, class Pointer, class Reference> |
|
41 |
+# if !defined(BOOST_MSVC_STD_ITERATOR) |
|
42 |
+ struct iterator_base : std::iterator<Category, T, Distance, Pointer, Reference> {}; |
|
43 |
+# else |
|
44 |
+ struct iterator_base : std::iterator<Category, T, Distance> |
|
45 |
+ { |
|
46 |
+ typedef Reference reference; |
|
47 |
+ typedef Pointer pointer; |
|
48 |
+ typedef Distance difference_type; |
|
49 |
+ }; |
|
50 |
+# endif |
|
51 |
+ } |
|
52 |
+ |
|
53 |
+ template <class Category, class T, class Distance = std::ptrdiff_t, |
|
54 |
+ class Pointer = T*, class Reference = T&> |
|
55 |
+ struct iterator : boost::detail::iterator_base<Category, T, Distance, Pointer, Reference> {}; |
|
56 |
+# endif |
|
57 |
+} // namespace boost |
|
58 |
+ |
|
59 |
+#endif // BOOST_ITERATOR_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,59 +1,20 @@ |
1 |
-// iterator.hpp workarounds for non-conforming standard libraries ---------// |
|
2 |
- |
|
3 |
-// (C) Copyright Beman Dawes 2000. Distributed under the Boost |
|
4 |
-// Software License, Version 1.0. (See accompanying file |
|
5 |
-// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
|
6 |
- |
|
7 |
-// See http://www.boost.org/libs/utility for documentation. |
|
8 |
- |
|
9 |
-// Revision History |
|
10 |
-// 12 Jan 01 added <cstddef> for std::ptrdiff_t (Jens Maurer) |
|
11 |
-// 28 Jun 00 Workarounds to deal with known MSVC bugs (David Abrahams) |
|
12 |
-// 26 Jun 00 Initial version (Jeremy Siek) |
|
13 |
- |
|
14 |
-#ifndef BOOST_ITERATOR_HPP |
|
15 |
-#define BOOST_ITERATOR_HPP |
|
16 |
- |
|
17 |
-#include <iterator> |
|
18 |
-#include <cstddef> // std::ptrdiff_t |
|
19 |
-#include <boost/config.hpp> |
|
20 |
- |
|
21 |
-namespace boost |
|
22 |
-{ |
|
23 |
-# if defined(BOOST_NO_STD_ITERATOR) && !defined(BOOST_MSVC_STD_ITERATOR) |
|
24 |
- template <class Category, class T, |
|
25 |
- class Distance = std::ptrdiff_t, |
|
26 |
- class Pointer = T*, class Reference = T&> |
|
27 |
- struct iterator |
|
28 |
- { |
|
29 |
- typedef T value_type; |
|
30 |
- typedef Distance difference_type; |
|
31 |
- typedef Pointer pointer; |
|
32 |
- typedef Reference reference; |
|
33 |
- typedef Category iterator_category; |
|
34 |
- }; |
|
35 |
-# else |
|
36 |
- |
|
37 |
- // declare iterator_base in namespace detail to work around MSVC bugs which |
|
38 |
- // prevent derivation from an identically-named class in a different namespace. |
|
39 |
- namespace detail { |
|
40 |
- template <class Category, class T, class Distance, class Pointer, class Reference> |
|
41 |
-# if !defined(BOOST_MSVC_STD_ITERATOR) |
|
42 |
- struct iterator_base : std::iterator<Category, T, Distance, Pointer, Reference> {}; |
|
43 |
-# else |
|
44 |
- struct iterator_base : std::iterator<Category, T, Distance> |
|
45 |
- { |
|
46 |
- typedef Reference reference; |
|
47 |
- typedef Pointer pointer; |
|
48 |
- typedef Distance difference_type; |
|
49 |
- }; |
|
50 |
-# endif |
|
51 |
- } |
|
52 |
- |
|
53 |
- template <class Category, class T, class Distance = std::ptrdiff_t, |
|
54 |
- class Pointer = T*, class Reference = T&> |
|
55 |
- struct iterator : boost::detail::iterator_base<Category, T, Distance, Pointer, Reference> {}; |
|
56 |
-# endif |
|
57 |
-} // namespace boost |
|
58 |
- |
|
59 |
-#endif // BOOST_ITERATOR_HPP |
|
1 |
+// (C) Copyright Beman Dawes 2000. Distributed under the Boost |
|
2 |
+// Software License, Version 1.0. (See accompanying file |
|
3 |
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
|
4 |
+ |
|
5 |
+#ifndef BOOST_ITERATOR_HPP |
|
6 |
+#define BOOST_ITERATOR_HPP |
|
7 |
+ |
|
8 |
+// This header is obsolete and will be deprecated. |
|
9 |
+ |
|
10 |
+#include <iterator> |
|
11 |
+#include <cstddef> // std::ptrdiff_t |
|
12 |
+ |
|
13 |
+namespace boost |
|
14 |
+{ |
|
15 |
+ |
|
16 |
+using std::iterator; |
|
17 |
+ |
|
18 |
+} // namespace boost |
|
19 |
+ |
|
20 |
+#endif // BOOST_ITERATOR_HPP |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@90716 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -1,4 +1,4 @@ |
1 |
-// interator.hpp workarounds for non-conforming standard libraries ---------// |
|
1 |
+// iterator.hpp workarounds for non-conforming standard libraries ---------// |
|
2 | 2 |
|
3 | 3 |
// (C) Copyright Beman Dawes 2000. Distributed under the Boost |
4 | 4 |
// Software License, Version 1.0. (See accompanying file |
git-svn-id: https://hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/mzR@57456 bc3139a8-67e5-0310-9ffc-ced21a209358
1 | 1 |
new file mode 100644 |
... | ... |
@@ -0,0 +1,59 @@ |
1 |
+// interator.hpp workarounds for non-conforming standard libraries ---------// |
|
2 |
+ |
|
3 |
+// (C) Copyright Beman Dawes 2000. Distributed under the Boost |
|
4 |
+// Software License, Version 1.0. (See accompanying file |
|
5 |
+// LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt) |
|
6 |
+ |
|
7 |
+// See http://www.boost.org/libs/utility for documentation. |
|
8 |
+ |
|
9 |
+// Revision History |
|
10 |
+// 12 Jan 01 added <cstddef> for std::ptrdiff_t (Jens Maurer) |
|
11 |
+// 28 Jun 00 Workarounds to deal with known MSVC bugs (David Abrahams) |
|
12 |
+// 26 Jun 00 Initial version (Jeremy Siek) |
|
13 |
+ |
|
14 |
+#ifndef BOOST_ITERATOR_HPP |
|
15 |
+#define BOOST_ITERATOR_HPP |
|
16 |
+ |
|
17 |
+#include <iterator> |
|
18 |
+#include <cstddef> // std::ptrdiff_t |
|
19 |
+#include <boost/config.hpp> |
|
20 |
+ |
|
21 |
+namespace boost |
|
22 |
+{ |
|
23 |
+# if defined(BOOST_NO_STD_ITERATOR) && !defined(BOOST_MSVC_STD_ITERATOR) |
|
24 |
+ template <class Category, class T, |
|
25 |
+ class Distance = std::ptrdiff_t, |
|
26 |
+ class Pointer = T*, class Reference = T&> |
|
27 |
+ struct iterator |
|
28 |
+ { |
|
29 |
+ typedef T value_type; |
|
30 |
+ typedef Distance difference_type; |
|
31 |
+ typedef Pointer pointer; |
|
32 |
+ typedef Reference reference; |
|
33 |
+ typedef Category iterator_category; |
|
34 |
+ }; |
|
35 |
+# else |
|
36 |
+ |
|
37 |
+ // declare iterator_base in namespace detail to work around MSVC bugs which |
|
38 |
+ // prevent derivation from an identically-named class in a different namespace. |
|
39 |
+ namespace detail { |
|
40 |
+ template <class Category, class T, class Distance, class Pointer, class Reference> |
|
41 |
+# if !defined(BOOST_MSVC_STD_ITERATOR) |
|
42 |
+ struct iterator_base : std::iterator<Category, T, Distance, Pointer, Reference> {}; |
|
43 |
+# else |
|
44 |
+ struct iterator_base : std::iterator<Category, T, Distance> |
|
45 |
+ { |
|
46 |
+ typedef Reference reference; |
|
47 |
+ typedef Pointer pointer; |
|
48 |
+ typedef Distance difference_type; |
|
49 |
+ }; |
|
50 |
+# endif |
|
51 |
+ } |
|
52 |
+ |
|
53 |
+ template <class Category, class T, class Distance = std::ptrdiff_t, |
|
54 |
+ class Pointer = T*, class Reference = T&> |
|
55 |
+ struct iterator : boost::detail::iterator_base<Category, T, Distance, Pointer, Reference> {}; |
|
56 |
+# endif |
|
57 |
+} // namespace boost |
|
58 |
+ |
|
59 |
+#endif // BOOST_ITERATOR_HPP |