Compare commits
280 Commits
Author | SHA1 | Date | |
---|---|---|---|
|
c6c9a85f21 | ||
|
139c6b50e6 | ||
|
1499fdf972 | ||
|
6534bae05f | ||
|
3cee16030b | ||
|
af66f9c00c | ||
|
299d009cc0 | ||
|
32555bac58 | ||
|
a4629aecca | ||
|
e556fceb05 | ||
|
1a524340e6 | ||
|
9aae0c8a00 | ||
|
b4c96119f1 | ||
|
3946a4a4b0 | ||
|
dc827b0935 | ||
|
b59c4b6666 | ||
|
4c456d525c | ||
|
47b8c9cad1 | ||
|
d50c552e84 | ||
|
7387f7d55f | ||
|
90138276af | ||
|
747d6e8fe2 | ||
|
1885d22687 | ||
|
5c4a0e07d3 | ||
|
9497c27f10 | ||
|
4c79bb2181 | ||
|
b634b3b0c8 | ||
|
cc95da10da | ||
|
b9e2eb12e9 | ||
|
91d3fad8f3 | ||
|
83bcf8daf2 | ||
|
d04833457b | ||
|
d185c08009 | ||
|
efff732f4f | ||
|
6e3f05c5de | ||
|
c54b0a0c9e | ||
|
91387222f5 | ||
|
a4b6003a94 | ||
|
30150eaf49 | ||
|
a919cdd969 | ||
|
7ace5f0128 | ||
|
218cc61036 | ||
|
59415588c8 | ||
|
6d2d8199e5 | ||
|
3da9bab88b | ||
|
d2c3a27558 | ||
|
e1dabc540b | ||
|
51c6915fb4 | ||
|
b9ad2bf8a2 | ||
|
733a71ce66 | ||
|
eb5a2d18d6 | ||
|
92f6971ea7 | ||
|
22ace9c9e6 | ||
|
0b594070c7 | ||
|
f9cbc68d43 | ||
|
310c56bc25 | ||
|
4672342671 | ||
|
f9845a940f | ||
|
b0ac251dd9 | ||
|
c7e4b76204 | ||
|
c2efae682b | ||
|
263025eccd | ||
|
93bdb8dad9 | ||
|
92a4e21c1a | ||
|
faf2199734 | ||
|
3c75cd19c7 | ||
|
94638715d9 | ||
|
5effd9fcd9 | ||
|
66eafe3099 | ||
|
d8ec5cd0e8 | ||
|
a59457fcda | ||
|
20123c5e6f | ||
|
3d13bdbd4b | ||
|
fb630fe1a0 | ||
|
7d5037b77f | ||
|
51fe9e0ae4 | ||
|
c779362f9f | ||
|
b7bc8de355 | ||
|
e283993866 | ||
|
b86f78331a | ||
|
a1b6b50100 | ||
|
2665c69e3a | ||
|
49492cb891 | ||
|
71b2be77a7 | ||
|
b30dad1db5 | ||
|
bf768ffd04 | ||
|
3759032dd6 | ||
|
3c9c670991 | ||
|
19702186d2 | ||
|
7c71c91f42 | ||
|
3207465702 | ||
|
f910549691 | ||
|
e08f962e12 | ||
|
42069777a6 | ||
|
c2b3a56ca0 | ||
|
1d8ca55777 | ||
|
ef172f114f | ||
|
7a87d76794 | ||
|
76691c3d42 | ||
|
eccf21b3c1 | ||
|
d3623dd584 | ||
|
e8afd726c5 | ||
|
b9aa7fb633 | ||
|
8d05191663 | ||
|
bed0c816db | ||
|
59715f5c7f | ||
|
6d22343534 | ||
|
22e9f44fdd | ||
|
55426ac770 | ||
|
6afec2d8a5 | ||
|
a513817fc5 | ||
|
cb253a3d3f | ||
|
94c7ec494d | ||
|
db69547da6 | ||
|
f99fe16ac3 | ||
|
0f7ace626f | ||
|
da0e080e4c | ||
|
9f44c82afd | ||
|
a4fac06f4f | ||
|
c3593a1e32 | ||
|
830a7f44cf | ||
|
4c75e770a9 | ||
|
954d15ee43 | ||
|
5a207d1e4a | ||
|
f0abb10476 | ||
|
e7f22175bb | ||
|
60a15dfc84 | ||
|
dc683c9132 | ||
|
6f895a0fef | ||
|
084c523878 | ||
|
0d0ad94a52 | ||
|
b56c31ff13 | ||
|
7fa0ea18d9 | ||
|
255051da37 | ||
|
0494a65cc9 | ||
|
c5eabd4220 | ||
|
e50fa4d644 | ||
|
43e7bf1610 | ||
|
b2935ff7ac | ||
|
a84c8455d8 | ||
|
5605dc8747 | ||
|
ba877e7805 | ||
|
91de02f8db | ||
|
bcaac65465 | ||
|
2a146a567b | ||
|
de6a0f31f2 | ||
|
50c4b88ebf | ||
|
45355f8107 | ||
|
ea81f69c26 | ||
|
a84f7fd048 | ||
|
ba25f6b6bb | ||
|
6628b109d0 | ||
|
6d69081e38 | ||
|
b5f76d5add | ||
|
44a7aadaed | ||
|
0c64b73a16 | ||
|
cccfe7b394 | ||
|
9053e61361 | ||
|
216eea2217 | ||
|
2dcacf6f3c | ||
|
a28c89a3ed | ||
|
a2450339df | ||
|
4fa851e387 | ||
|
dcde8a7557 | ||
|
b88ee83322 | ||
|
f68c4dd925 | ||
|
e86e3c9db2 | ||
|
a18ee82f35 | ||
|
d6ae5d8d4d | ||
|
939bdf0202 | ||
|
bc9c5908b6 | ||
|
6b86fe4dc1 | ||
|
8aad81e67c | ||
|
3f6cbc89ed | ||
|
9fd0eee555 | ||
|
a80aba9a3a | ||
|
7af0b4e843 | ||
|
b8e37f1d07 | ||
|
3ff9d8346b | ||
|
979f500141 | ||
|
9f85852534 | ||
|
1a7f14244d | ||
|
0f5140e4c1 | ||
|
a7311be698 | ||
|
8cbc559305 | ||
|
a9044bc779 | ||
|
e222e6eb69 | ||
|
252cfe78cc | ||
|
39e2c15fd4 | ||
|
54ddcfc414 | ||
|
7a3ddc5eb8 | ||
|
76982ecb0f | ||
|
7e49cbd1ad | ||
|
3957a04980 | ||
|
d5ee7fce50 | ||
|
d7d96c8c27 | ||
|
aa86edc9c6 | ||
|
21495bb58e | ||
|
388db9a379 | ||
|
08909f63ae | ||
|
b00a03fd36 | ||
|
0d81224cf6 | ||
|
40072668be | ||
|
b3f5fc485e | ||
|
cb217512d7 | ||
|
8de4e80625 | ||
|
51023f006e | ||
|
6fa0acc376 | ||
|
646ad8dd4f | ||
|
787d07db37 | ||
|
50e7fa2daf | ||
|
5477eebe96 | ||
|
7e68ff5290 | ||
|
9865f92577 | ||
|
078021db91 | ||
|
7a52c341d7 | ||
|
d901bcf2c5 | ||
|
d43949dd22 | ||
|
121dc65949 | ||
|
540c65bbfc | ||
|
07dee9ca25 | ||
|
8bb6ea14c9 | ||
|
53e8e43e72 | ||
|
3b10e19284 | ||
|
b7e0ada0f9 | ||
|
9cc1979eb0 | ||
|
85e1b4dc59 | ||
|
5b821b0748 | ||
|
38b520ef67 | ||
|
143f670fa9 | ||
|
0de91b187b | ||
|
7344a3aedc | ||
|
80e381340c | ||
|
b098466e10 | ||
|
74756b504a | ||
|
d4a8798a99 | ||
|
ed95db05cd | ||
|
cb16edf393 | ||
|
74258ccf44 | ||
|
91d00b2225 | ||
|
99812266c6 | ||
|
63044e7881 | ||
|
a4e10f90e4 | ||
|
4e883bf349 | ||
|
145dbee405 | ||
|
b9bddec655 | ||
|
f3e80a3bfa | ||
|
462f3a66e2 | ||
|
ff2b899a33 | ||
|
d284b1b9f2 | ||
|
94bd2da100 | ||
|
3bfbaa6e4e | ||
|
281f2147cf | ||
|
3f89025bf6 | ||
|
a1891f493f | ||
|
71946ab51e | ||
|
53794d70d1 | ||
|
8bda291735 | ||
|
c6e3871a68 | ||
|
667c3698df | ||
|
324d6eb0cb | ||
|
e34999075e | ||
|
e45bd9c670 | ||
|
cba7e47852 | ||
|
c4b14f1243 | ||
|
721aded241 | ||
|
1891c7ba66 | ||
|
456c3cfce0 | ||
|
3ce89fee2e | ||
|
78eebed0cd | ||
|
bcb908e5d8 | ||
|
493985599d | ||
|
fdf885d144 | ||
|
00685e2127 | ||
|
8602a6ea49 | ||
|
99838fe19f | ||
|
662439cda1 | ||
|
ab7902e738 | ||
|
908d7d2963 | ||
|
da089f5ee9 |
10
.gitignore
vendored
10
.gitignore
vendored
@ -1 +1,9 @@
|
|||||||
boost_1_37_0.tar.bz2
|
boost*.tar.*
|
||||||
|
boost-*.src.rpm
|
||||||
|
clog
|
||||||
|
.build*
|
||||||
|
boost_*/
|
||||||
|
*/*.rpm
|
||||||
|
/boost_1_44_0.tar.bz2
|
||||||
|
/cmakeify_boost_1440_2.patch
|
||||||
|
/cmakeify_boost_1440_3.patch
|
||||||
|
150
boost-1.48.0-add-bjam-man-page.patch
Normal file
150
boost-1.48.0-add-bjam-man-page.patch
Normal file
@ -0,0 +1,150 @@
|
|||||||
|
diff --git a/tools/build/v2/doc/bjam.1 b/tools/build/v2/doc/bjam.1
|
||||||
|
new file mode 100644
|
||||||
|
index 0000000..8a44af6
|
||||||
|
--- /dev/null
|
||||||
|
+++ b/tools/build/v2/doc/bjam.1
|
||||||
|
@@ -0,0 +1,144 @@
|
||||||
|
+.TH "bjam" 1 "Sat Nov 19 2011" "Doxygen" \" -*- nroff -*-
|
||||||
|
+.ad l
|
||||||
|
+.nh
|
||||||
|
+.SH NAME
|
||||||
|
+bjam \- Command-line utility to build Boost-related C++ projects with Boost\&.Build
|
||||||
|
+.SH "SYNOPSIS"
|
||||||
|
+.PP
|
||||||
|
+\fBbjam\fP \fC[-a] [-dx] [-fx] [-jx] [-lx] [-n] [-ox] [-px] [-q] [-sx=y] [-tx] [-v] [--x]\fP
|
||||||
|
+.PP
|
||||||
|
+\fIbjam\fP accepts the following options:
|
||||||
|
+.PP
|
||||||
|
+\fB-a\fP
|
||||||
|
+.br
|
||||||
|
+ Build all targets, even if they are current
|
||||||
|
+.PP
|
||||||
|
+\fB-dx\fP
|
||||||
|
+.br
|
||||||
|
+ Set the debug level to x (0-9)
|
||||||
|
+.PP
|
||||||
|
+\fB-fx\fP
|
||||||
|
+.br
|
||||||
|
+ Read x instead of Jambase
|
||||||
|
+.PP
|
||||||
|
+\fB-jx\fP
|
||||||
|
+.br
|
||||||
|
+ Run up to x shell commands concurrently
|
||||||
|
+.PP
|
||||||
|
+\fB-lx\fP
|
||||||
|
+.br
|
||||||
|
+ Limit actions to x number of seconds after which they are stopped
|
||||||
|
+.PP
|
||||||
|
+\fB-n\fP
|
||||||
|
+.br
|
||||||
|
+ Don't actually execute the updating actions
|
||||||
|
+.PP
|
||||||
|
+\fB-ox\fP
|
||||||
|
+.br
|
||||||
|
+ Write the updating actions to file x
|
||||||
|
+.PP
|
||||||
|
+\fB-px\fP
|
||||||
|
+.br
|
||||||
|
+ x=0, pipes action stdout and stderr merged into action output
|
||||||
|
+.PP
|
||||||
|
+\fB-q\fP
|
||||||
|
+.br
|
||||||
|
+ Quit quickly as soon as a target fails
|
||||||
|
+.PP
|
||||||
|
+\fB-sx=y\fP
|
||||||
|
+.br
|
||||||
|
+ Set variable x=y, overriding environment
|
||||||
|
+.PP
|
||||||
|
+\fB-tx\fP
|
||||||
|
+.br
|
||||||
|
+ Rebuild x, even if it is up-to-date
|
||||||
|
+.PP
|
||||||
|
+\fB-v\fP
|
||||||
|
+.br
|
||||||
|
+ Print the version of jam and exit
|
||||||
|
+.PP
|
||||||
|
+\fB--x\fP
|
||||||
|
+.br
|
||||||
|
+ Option is ignored
|
||||||
|
+.SH "DESCRIPTION"
|
||||||
|
+.PP
|
||||||
|
+This section provides the information necessary to create your own projects using \fIBoost\&.Build\fP The information provided here is relatively high-level, and Chapter 6, Reference as well as the on-line help system must be used to obtain low-level documentation (see --help)
|
||||||
|
+.PP
|
||||||
|
+\fIBoost\&.Build\fP actually consists of two parts - \fIBoost\&.Jam\fP, a build engine with its own interpreted language, and \fIBoost\&.Build\fP itself, implemented in \fIBoost\&.Jam's\fP language\&. The chain of events when you type bjam on the command line is as follows:
|
||||||
|
+.IP "\(bu" 2
|
||||||
|
+\fIBoost\&.Jam\fP tries to find \fIBoost\&.Build\fP and loads the top-level module\&. The exact process is described in the section called “Initialization”
|
||||||
|
+.PP
|
||||||
|
+.PP
|
||||||
|
+.IP "\(bu" 2
|
||||||
|
+The top-level module loads user-defined configuration files, \fIuser-config\&.jam\fP and \fIsite-config\&.jam\fP, which define available toolsets
|
||||||
|
+.PP
|
||||||
|
+.PP
|
||||||
|
+.IP "\(bu" 2
|
||||||
|
+The \fIJamfile\fP in the current directory is read That in turn might cause reading of further Jamfiles\&. As a result, a tree of projects is created, with targets inside projects
|
||||||
|
+.PP
|
||||||
|
+.PP
|
||||||
|
+.IP "\(bu" 2
|
||||||
|
+Finally, using the build request specified on the command line, \fIBoost\&.Build\fP decides which targets should be built and how\&. That information is passed back to \fIBoost\&.Jam\fP, which takes care of actually running the scheduled build action commands
|
||||||
|
+.PP
|
||||||
|
+.PP
|
||||||
|
+So, to be able to successfully use \fIBoost\&.Build\fP, you need to know only four things:
|
||||||
|
+.IP "\(bu" 2
|
||||||
|
+How to configure \fIBoost\&.Build\fP (http://www.boost.org/boost-build2/doc/html/bbv2/overview/configuration.html)
|
||||||
|
+.IP "\(bu" 2
|
||||||
|
+How to declare targets in Jamfiles (http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html)
|
||||||
|
+.IP "\(bu" 2
|
||||||
|
+How the build process works (http://www.boost.org/boost-build2/doc/html/bbv2/overview/build_process.html)
|
||||||
|
+.PP
|
||||||
|
+.PP
|
||||||
|
+Some Basics about the \fIBoost\&.Jam\fP language\&. See the section called “Boost\&.Jam Language” (http://www.boost.org/boost-build2/doc/html/bbv2/overview/jam_language.html)
|
||||||
|
+.SH "CONCEPTS"
|
||||||
|
+.PP
|
||||||
|
+\fIBoost\&.Build\fP has a few unique concepts that are introduced in this section\&. The best way to explain the concepts is by comparison with more classical build tools
|
||||||
|
+.PP
|
||||||
|
+When using any flavour of make, you directly specify targets and commands that are used to create them from other target\&. The below example creates a\&.o from a\&.c using a hardcoded compiler invocation command
|
||||||
|
+.PP
|
||||||
|
+a\&.o: a\&.c
|
||||||
|
+.br
|
||||||
|
+ g++ -o a\&.o -g a\&.c
|
||||||
|
+.PP
|
||||||
|
+This is rather low-level description mechanism and it is hard to adjust commands, options, and sets of created targets depending on the used compiler and operating system\&.
|
||||||
|
+.PP
|
||||||
|
+To improve portability, most modern build system provide a set of higher-level functions that can be used in build description files\&. Consider this example:
|
||||||
|
+.PP
|
||||||
|
+add_program ('a', 'a\&.c')
|
||||||
|
+.br
|
||||||
|
+.PP
|
||||||
|
+This is a function call that creates targets necessary to create executable file from source file a\&.c\&. Depending on configured properties, different commands line may be used\&. However, \fIadd_program\fP is higher-level, but rather thin level All targets are created immediately when build description is parsed, which makes it impossible to perform multi-variant builds\&. Often, change in any build property requires complete reconfiguration of the build tree
|
||||||
|
+.PP
|
||||||
|
+In order to support true multivariant builds, Boost\&.Build introduces the concept of metatarget—object that is created when build description is parsed and can be later called with specific build properties to generate actual targets
|
||||||
|
+.PP
|
||||||
|
+Consider an example:
|
||||||
|
+.PP
|
||||||
|
+exe a : a\&.cpp ;
|
||||||
|
+.br
|
||||||
|
+.PP
|
||||||
|
+When this declaration is parsed, \fIBoost\&.Build\fP creates a metatarget, but does not yet decides what files must be created, or what commands must be used\&. After all build files are parsed, Boost\&.Build considers properties requested on the command line\&. Supposed you have invoked \fIBoost\&.Build\fP with:
|
||||||
|
+.PP
|
||||||
|
+\fIbjam\fP toolset=gcc toolset=msvc
|
||||||
|
+.br
|
||||||
|
+.PP
|
||||||
|
+In that case, the metatarget will be called twice, once with toolset=gcc and once with toolset=msvc\&. Both invocations will produce concrete targets, that will have different extensions and use different command lines\&. Another key concept is build property\&. Build property is a variable that affects the build process\&. It can be specified on the command line, and is passed when calling a metatarget
|
||||||
|
+.PP
|
||||||
|
+While all build tools have a similar mechanism, \fIBoost\&.Build\fP differs by requiring that all build properties are declared in advance, and providing a large set of properties with portable semantics
|
||||||
|
+.PP
|
||||||
|
+The final concept is property propagation\&. Boost\&.Build does not require that every metatarget is called with the same properties\&. Instead, the 'top-level' metatargets are called with the properties specified on the command line Each metatarget can elect to augment or override some properties (in particular, using the requirements mechanism, see the section called “Requirements”: http://www.boost.org/boost-build2/doc/html/bbv2/overview/targets.html#bbv2.overview.targets.requirements) Then, the dependency metatargets are called with modified properties and produce concrete targets that are then used in build process Of course, dependency metatargets maybe in turn modify build properties and have dependencies of their own\&.
|
||||||
|
+.PP
|
||||||
|
+For more in-depth treatment of the requirements and concepts, you may refer to SYRCoSE 2009 Boost\&.Build article (http://syrcose.ispras.ru/2009/files/04_paper.pdf)\&.
|
||||||
|
+.SH "SEE ALSO"
|
||||||
|
+.PP
|
||||||
|
+\fBboost-libraries\fP(3)
|
||||||
|
+.SH "SUPPORT"
|
||||||
|
+.PP
|
||||||
|
+Please report any bugs to https://svn.boost.org/trac/boost/
|
||||||
|
+.SH "COPYRIGHT"
|
||||||
|
+.PP
|
||||||
|
+Boost Software License - Version 1\&.0 - August 17th, 2003
|
||||||
|
+.PP
|
||||||
|
+See the LICENSE_1_0\&.txt file for more information on that license, or directly on Internet:
|
||||||
|
+.br
|
||||||
|
+ http://www.boost.org/LICENSE_1_0.txt
|
22
boost-1.50.0-fix-non-utf8-files.patch
Normal file
22
boost-1.50.0-fix-non-utf8-files.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/libs/units/example/autoprefixes.cpp b/libs/units/example/autoprefixes.cpp
|
||||||
|
index 8b2bc43..d04f2fe 100644
|
||||||
|
--- a/libs/units/example/autoprefixes.cpp
|
||||||
|
+++ b/libs/units/example/autoprefixes.cpp
|
||||||
|
@@ -67,7 +67,7 @@ struct thing_base_unit : boost::units::base_unit<thing_base_unit, boost::units::
|
||||||
|
struct euro_base_unit : boost::units::base_unit<euro_base_unit, boost::units::dimensionless_type, 5>
|
||||||
|
{
|
||||||
|
static const char* name() { return("EUR"); }
|
||||||
|
- static const char* symbol() { return("€"); }
|
||||||
|
+ static const char* symbol() { return("€"); }
|
||||||
|
};
|
||||||
|
|
||||||
|
int main()
|
||||||
|
@@ -140,7 +140,7 @@ int main()
|
||||||
|
|
||||||
|
quantity<euro_base_unit::unit_type> ce = 2048. * euro_base_unit::unit_type();
|
||||||
|
cout << name_format << engineering_prefix << ce << endl; // 2.048 kiloEUR
|
||||||
|
- cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€
|
||||||
|
+ cout << symbol_format << engineering_prefix << ce << endl; // 2.048 k€
|
||||||
|
|
||||||
|
|
||||||
|
return 0;
|
60
boost-1.50.0-foreach.patch
Normal file
60
boost-1.50.0-foreach.patch
Normal file
@ -0,0 +1,60 @@
|
|||||||
|
Index: /trunk/boost/foreach_fwd.hpp
|
||||||
|
===================================================================
|
||||||
|
--- /trunk/boost/foreach_fwd.hpp (revision 62661)
|
||||||
|
+++ /trunk/boost/foreach_fwd.hpp (revision 75540)
|
||||||
|
@@ -15,4 +15,6 @@
|
||||||
|
#define BOOST_FOREACH_FWD_HPP
|
||||||
|
|
||||||
|
+#include <utility> // for std::pair
|
||||||
|
+
|
||||||
|
// This must be at global scope, hence the uglified name
|
||||||
|
enum boost_foreach_argument_dependent_lookup_hack
|
||||||
|
@@ -26,4 +28,7 @@
|
||||||
|
namespace foreach
|
||||||
|
{
|
||||||
|
+ template<typename T>
|
||||||
|
+ std::pair<T, T> in_range(T begin, T end);
|
||||||
|
+
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
// boost::foreach::tag
|
||||||
|
@@ -47,4 +52,22 @@
|
||||||
|
} // namespace foreach
|
||||||
|
|
||||||
|
+// Workaround for unfortunate https://svn.boost.org/trac/boost/ticket/6131
|
||||||
|
+namespace BOOST_FOREACH
|
||||||
|
+{
|
||||||
|
+ using foreach::in_range;
|
||||||
|
+ using foreach::tag;
|
||||||
|
+
|
||||||
|
+ template<typename T>
|
||||||
|
+ struct is_lightweight_proxy
|
||||||
|
+ : foreach::is_lightweight_proxy<T>
|
||||||
|
+ {};
|
||||||
|
+
|
||||||
|
+ template<typename T>
|
||||||
|
+ struct is_noncopyable
|
||||||
|
+ : foreach::is_noncopyable<T>
|
||||||
|
+ {};
|
||||||
|
+
|
||||||
|
+} // namespace BOOST_FOREACH
|
||||||
|
+
|
||||||
|
} // namespace boost
|
||||||
|
|
||||||
|
Index: /trunk/boost/foreach.hpp
|
||||||
|
===================================================================
|
||||||
|
--- /trunk/boost/foreach.hpp (revision 75077)
|
||||||
|
+++ /trunk/boost/foreach.hpp (revision 75540)
|
||||||
|
@@ -166,5 +166,5 @@
|
||||||
|
// at the global namespace for your type.
|
||||||
|
template<typename T>
|
||||||
|
-inline boost::foreach::is_lightweight_proxy<T> *
|
||||||
|
+inline boost::BOOST_FOREACH::is_lightweight_proxy<T> *
|
||||||
|
boost_foreach_is_lightweight_proxy(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
|
||||||
|
|
||||||
|
@@ -191,5 +191,5 @@
|
||||||
|
// at the global namespace for your type.
|
||||||
|
template<typename T>
|
||||||
|
-inline boost::foreach::is_noncopyable<T> *
|
||||||
|
+inline boost::BOOST_FOREACH::is_noncopyable<T> *
|
||||||
|
boost_foreach_is_noncopyable(T *&, BOOST_FOREACH_TAG_DEFAULT) { return 0; }
|
||||||
|
|
80
boost-1.53.0-fpclassify-unused_typedef.patch
Normal file
80
boost-1.53.0-fpclassify-unused_typedef.patch
Normal file
@ -0,0 +1,80 @@
|
|||||||
|
diff -up boost_1_53_0/boost/math/special_functions/sign.hpp\~ boost_1_53_0/boost/math/special_functions/sign.hpp
|
||||||
|
--- boost_1_53_0/boost/math/special_functions/sign.hpp~ 2011-05-17 14:19:17.000000000 +0200
|
||||||
|
+++ boost_1_53_0/boost/math/special_functions/sign.hpp 2013-07-22 23:24:39.751342557 +0200
|
||||||
|
@@ -110,7 +110,6 @@ template<class T> int (signbit)(T x)
|
||||||
|
{
|
||||||
|
typedef typename detail::fp_traits<T>::type traits;
|
||||||
|
typedef typename traits::method method;
|
||||||
|
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
||||||
|
return detail::signbit_impl(x, method());
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -124,7 +123,6 @@ template<class T> T (changesign)(const T
|
||||||
|
{ //!< \brief return unchanged binary pattern of x, except for change of sign bit.
|
||||||
|
typedef typename detail::fp_traits<T>::sign_change_type traits;
|
||||||
|
typedef typename traits::method method;
|
||||||
|
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
||||||
|
|
||||||
|
return detail::changesign_impl(x, method());
|
||||||
|
}
|
||||||
|
diff -up boost_1_53_0/boost/math/special_functions/fpclassify.hpp~ boost_1_53_0/boost/math/special_functions/fpclassify.hpp
|
||||||
|
--- boost_1_53_0/boost/math/special_functions/fpclassify.hpp~ 2012-12-12 19:17:22.000000000 +0100
|
||||||
|
+++ boost_1_53_0/boost/math/special_functions/fpclassify.hpp 2013-07-22 12:07:59.478713488 +0200
|
||||||
|
@@ -327,7 +327,6 @@ inline bool (isfinite)(T x)
|
||||||
|
{ //!< \brief return true if floating-point type t is finite.
|
||||||
|
typedef typename detail::fp_traits<T>::type traits;
|
||||||
|
typedef typename traits::method method;
|
||||||
|
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
||||||
|
typedef typename tools::promote_args<T>::type value_type;
|
||||||
|
return detail::isfinite_impl(static_cast<value_type>(x), method());
|
||||||
|
}
|
||||||
|
@@ -338,7 +338,6 @@ inline bool (isfinite)(long double x)
|
||||||
|
{ //!< \brief return true if floating-point type t is finite.
|
||||||
|
typedef detail::fp_traits<long double>::type traits;
|
||||||
|
typedef traits::method method;
|
||||||
|
- typedef boost::is_floating_point<long double>::type fp_tag;
|
||||||
|
typedef long double value_type;
|
||||||
|
return detail::isfinite_impl(static_cast<value_type>(x), method());
|
||||||
|
}
|
||||||
|
@@ -398,7 +397,6 @@ inline bool (isnormal)(T x)
|
||||||
|
{
|
||||||
|
typedef typename detail::fp_traits<T>::type traits;
|
||||||
|
typedef typename traits::method method;
|
||||||
|
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
||||||
|
typedef typename tools::promote_args<T>::type value_type;
|
||||||
|
return detail::isnormal_impl(static_cast<value_type>(x), method());
|
||||||
|
}
|
||||||
|
@@ -409,7 +408,6 @@ inline bool (isnormal)(long double x)
|
||||||
|
{
|
||||||
|
typedef detail::fp_traits<long double>::type traits;
|
||||||
|
typedef traits::method method;
|
||||||
|
- typedef boost::is_floating_point<long double>::type fp_tag;
|
||||||
|
typedef long double value_type;
|
||||||
|
return detail::isnormal_impl(static_cast<value_type>(x), method());
|
||||||
|
}
|
||||||
|
@@ -487,7 +485,6 @@ inline bool (isinf)(T x)
|
||||||
|
{
|
||||||
|
typedef typename detail::fp_traits<T>::type traits;
|
||||||
|
typedef typename traits::method method;
|
||||||
|
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
||||||
|
typedef typename tools::promote_args<T>::type value_type;
|
||||||
|
return detail::isinf_impl(static_cast<value_type>(x), method());
|
||||||
|
}
|
||||||
|
@@ -498,7 +496,6 @@ inline bool (isinf)(long double x)
|
||||||
|
{
|
||||||
|
typedef detail::fp_traits<long double>::type traits;
|
||||||
|
typedef traits::method method;
|
||||||
|
- typedef boost::is_floating_point<long double>::type fp_tag;
|
||||||
|
typedef long double value_type;
|
||||||
|
return detail::isinf_impl(static_cast<value_type>(x), method());
|
||||||
|
}
|
||||||
|
@@ -570,7 +567,6 @@ inline bool (isnan)(T x)
|
||||||
|
{ //!< \brief return true if floating-point type t is NaN (Not A Number).
|
||||||
|
typedef typename detail::fp_traits<T>::type traits;
|
||||||
|
typedef typename traits::method method;
|
||||||
|
- typedef typename boost::is_floating_point<T>::type fp_tag;
|
||||||
|
return detail::isnan_impl(x, method());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Diff finished. Mon Jul 22 12:09:24 2013
|
130
boost-1.53.0-graph-unused_typedef.patch
Normal file
130
boost-1.53.0-graph-unused_typedef.patch
Normal file
@ -0,0 +1,130 @@
|
|||||||
|
diff -urp boost_1_54_0-orig/boost/graph/breadth_first_search.hpp boost_1_54_0/boost/graph/breadth_first_search.hpp
|
||||||
|
--- boost_1_54_0-orig/boost/graph/breadth_first_search.hpp 2013-07-23 00:47:43.418886551 +0200
|
||||||
|
+++ boost_1_54_0/boost/graph/breadth_first_search.hpp 2013-07-23 00:50:40.339958756 +0200
|
||||||
|
@@ -64,7 +64,6 @@ namespace boost {
|
||||||
|
BOOST_CONCEPT_ASSERT(( IncidenceGraphConcept<IncidenceGraph> ));
|
||||||
|
typedef graph_traits<IncidenceGraph> GTraits;
|
||||||
|
typedef typename GTraits::vertex_descriptor Vertex;
|
||||||
|
- typedef typename GTraits::edge_descriptor Edge;
|
||||||
|
BOOST_CONCEPT_ASSERT(( BFSVisitorConcept<BFSVisitor, IncidenceGraph> ));
|
||||||
|
BOOST_CONCEPT_ASSERT(( ReadWritePropertyMapConcept<ColorMap, Vertex> ));
|
||||||
|
typedef typename property_traits<ColorMap>::value_type ColorValue;
|
||||||
|
diff -urp boost_1_53_0-orig/boost/graph/compressed_sparse_row_graph.hpp boost_1_53_0/boost/graph/compressed_sparse_row_graph.hpp
|
||||||
|
--- boost_1_53_0-orig/boost/graph/compressed_sparse_row_graph.hpp 2013-07-23 01:32:19.273266030 +0200
|
||||||
|
+++ boost_1_53_0/boost/graph/compressed_sparse_row_graph.hpp 2013-07-23 01:34:15.202970721 +0200
|
||||||
|
@@ -642,8 +642,6 @@ class compressed_sparse_row_graph<direct
|
||||||
|
const GlobalToLocal& global_to_local) {
|
||||||
|
typedef compressed_sparse_row_graph Graph;
|
||||||
|
typedef typename boost::graph_traits<Graph>::vertex_descriptor vertex_t;
|
||||||
|
- typedef typename boost::graph_traits<Graph>::vertices_size_type vertex_num;
|
||||||
|
- typedef typename boost::graph_traits<Graph>::edges_size_type edge_num;
|
||||||
|
typedef std::vector<std::pair<vertex_t, vertex_t> > edge_vector_t;
|
||||||
|
edge_vector_t new_edges(first, last);
|
||||||
|
if (new_edges.empty()) return;
|
||||||
|
@@ -666,8 +664,6 @@ class compressed_sparse_row_graph<direct
|
||||||
|
const GlobalToLocal& global_to_local) {
|
||||||
|
typedef compressed_sparse_row_graph Graph;
|
||||||
|
typedef typename boost::graph_traits<Graph>::vertex_descriptor vertex_t;
|
||||||
|
- typedef typename boost::graph_traits<Graph>::vertices_size_type vertex_num;
|
||||||
|
- typedef typename boost::graph_traits<Graph>::edges_size_type edge_num;
|
||||||
|
typedef std::pair<vertex_t, vertex_t> vertex_pair;
|
||||||
|
typedef std::vector<
|
||||||
|
boost::tuple<vertex_pair,
|
||||||
|
@@ -1164,7 +1160,6 @@ inline std::pair<typename BOOST_BIDIR_CS
|
||||||
|
typename BOOST_BIDIR_CSR_GRAPH_TYPE::in_edge_iterator>
|
||||||
|
in_edges(Vertex v, const BOOST_BIDIR_CSR_GRAPH_TYPE& g)
|
||||||
|
{
|
||||||
|
- typedef typename BOOST_BIDIR_CSR_GRAPH_TYPE::edge_descriptor ed;
|
||||||
|
typedef typename BOOST_BIDIR_CSR_GRAPH_TYPE::in_edge_iterator it;
|
||||||
|
EdgeIndex v_row_start = g.m_backward.m_rowstart[v];
|
||||||
|
EdgeIndex next_row_start = g.m_backward.m_rowstart[v + 1];
|
||||||
|
@@ -1368,7 +1363,6 @@ put(Tag tag,
|
||||||
|
typename property_map<BOOST_CSR_GRAPH_TYPE, Tag>::key_type k,
|
||||||
|
typename lookup_one_property<typename property_map<BOOST_CSR_GRAPH_TYPE, Tag>::plist_type, Tag>::type val) {
|
||||||
|
typedef typename property_map<BOOST_CSR_GRAPH_TYPE, Tag>::all_tag all_tag;
|
||||||
|
- typedef typename property_map<BOOST_CSR_GRAPH_TYPE, all_tag>::type outer_pm;
|
||||||
|
lookup_one_property<typename property_map<BOOST_CSR_GRAPH_TYPE, Tag>::plist_type, Tag>::lookup(get(all_tag(), g, k), tag) = val;
|
||||||
|
}
|
||||||
|
|
||||||
|
diff -urp boost_1_53_0-orig/boost/graph/detail/adjacency_list.hpp boost_1_53_0/boost/graph/detail/adjacency_list.hpp
|
||||||
|
--- boost_1_53_0-orig/boost/graph/detail/adjacency_list.hpp 2013-07-23 01:32:19.390266741 +0200
|
||||||
|
+++ boost_1_53_0/boost/graph/detail/adjacency_list.hpp 2013-07-23 01:34:15.275971164 +0200
|
||||||
|
@@ -634,7 +634,6 @@ namespace boost {
|
||||||
|
directed_graph_helper<Config>& g_)
|
||||||
|
{
|
||||||
|
typedef typename Config::graph_type graph_type;
|
||||||
|
- typedef typename Config::edge_parallel_category Cat;
|
||||||
|
graph_type& g = static_cast<graph_type&>(g_);
|
||||||
|
g.out_edge_list(u).clear();
|
||||||
|
// clear() should be a req of Sequence and AssociativeContainer,
|
||||||
|
@@ -781,7 +780,6 @@ namespace boost {
|
||||||
|
typedef typename Graph::global_edgelist_selector EdgeListS;
|
||||||
|
BOOST_STATIC_ASSERT((!is_same<EdgeListS, vecS>::value));
|
||||||
|
|
||||||
|
- typedef typename EdgeList::value_type StoredEdge;
|
||||||
|
typename EdgeList::iterator i = el.begin(), end = el.end();
|
||||||
|
for (; i != end; ++i) {
|
||||||
|
if ((*i).get_target() == v) {
|
||||||
|
@@ -986,7 +984,6 @@ namespace boost {
|
||||||
|
BOOST_STATIC_ASSERT((!is_same<EdgeListS, vecS>::value));
|
||||||
|
|
||||||
|
typedef typename Config::graph_type graph_type;
|
||||||
|
- typedef typename Config::edge_parallel_category Cat;
|
||||||
|
graph_type& g = static_cast<graph_type&>(g_);
|
||||||
|
while (true) {
|
||||||
|
typename Config::out_edge_iterator ei, ei_end;
|
||||||
|
@@ -1588,7 +1585,6 @@ namespace boost {
|
||||||
|
typedef typename Config::graph_type Graph;
|
||||||
|
typedef typename Config::StoredEdge StoredEdge;
|
||||||
|
const Graph& cg = static_cast<const Graph&>(g_);
|
||||||
|
- typedef typename Config::out_edge_iterator out_edge_iterator;
|
||||||
|
const typename Config::OutEdgeList& el = cg.out_edge_list(u);
|
||||||
|
typename Config::OutEdgeList::const_iterator it = graph_detail::
|
||||||
|
find(el, StoredEdge(v));
|
||||||
|
diff -urp boost_1_53_0-orig/boost/graph/detail/compressed_sparse_row_struct.hpp boost_1_53_0/boost/graph/detail/compressed_sparse_row_struct.hpp
|
||||||
|
--- boost_1_53_0-orig/boost/graph/detail/compressed_sparse_row_struct.hpp 2013-07-23 01:32:19.395266772 +0200
|
||||||
|
+++ boost_1_53_0/boost/graph/detail/compressed_sparse_row_struct.hpp 2013-07-23 01:34:15.278971182 +0200
|
||||||
|
@@ -218,8 +218,6 @@ namespace detail {
|
||||||
|
// the user has supplied the number of edges.
|
||||||
|
edges_size_type numedges = numedges_or_zero;
|
||||||
|
if (numedges == 0) {
|
||||||
|
- typedef typename std::iterator_traits<InputIterator>::iterator_category
|
||||||
|
- category;
|
||||||
|
numedges = boost::graph::detail::reserve_count_for_single_pass(edge_begin, edge_end);
|
||||||
|
}
|
||||||
|
m_column.clear();
|
||||||
|
@@ -313,7 +311,6 @@ namespace detail {
|
||||||
|
inherited_edge_properties::resize(numedges);
|
||||||
|
EdgeIndex current_edge = 0;
|
||||||
|
typedef typename boost::graph_traits<Graph>::vertex_descriptor g_vertex;
|
||||||
|
- typedef typename boost::graph_traits<Graph>::edge_descriptor g_edge;
|
||||||
|
typedef typename boost::graph_traits<Graph>::out_edge_iterator
|
||||||
|
g_out_edge_iter;
|
||||||
|
|
||||||
|
@@ -347,7 +344,6 @@ namespace detail {
|
||||||
|
// Flip sequence
|
||||||
|
BidirectionalIterator first(last_sorted);
|
||||||
|
BidirectionalIterator last(first_sorted);
|
||||||
|
- typedef Vertex vertex_t;
|
||||||
|
typedef Vertex vertex_num;
|
||||||
|
typedef EdgeIndex edge_num;
|
||||||
|
edge_num new_edge_count = std::distance(first, last);
|
||||||
|
diff -urp boost_1_53_0-orig/boost/graph/detail/histogram_sort.hpp boost_1_53_0/boost/graph/detail/histogram_sort.hpp
|
||||||
|
--- boost_1_53_0-orig/boost/graph/detail/histogram_sort.hpp 2013-07-23 01:32:19.364266583 +0200
|
||||||
|
+++ boost_1_53_0/boost/graph/detail/histogram_sort.hpp 2013-07-23 01:34:15.279971188 +0200
|
||||||
|
@@ -159,7 +159,6 @@ histogram_sort_inplace(KeyIterator key_b
|
||||||
|
Value1Iter values1,
|
||||||
|
KeyTransform key_transform) {
|
||||||
|
|
||||||
|
- typedef NumKeys vertices_size_type;
|
||||||
|
typedef typename std::iterator_traits<RowstartIterator>::value_type EdgeIndex;
|
||||||
|
|
||||||
|
// 1. Copy m_rowstart (except last element) to get insert positions
|
||||||
|
@@ -194,7 +193,6 @@ histogram_sort_inplace(KeyIterator key_b
|
||||||
|
Value2Iter values2,
|
||||||
|
KeyTransform key_transform) {
|
||||||
|
|
||||||
|
- typedef NumKeys vertices_size_type;
|
||||||
|
typedef typename std::iterator_traits<RowstartIterator>::value_type EdgeIndex;
|
||||||
|
|
||||||
|
// 1. Copy m_rowstart (except last element) to get insert positions
|
13
boost-1.53.0-lexical_cast-unused_typedef.patch
Normal file
13
boost-1.53.0-lexical_cast-unused_typedef.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
diff -up boost_1_53_0/boost/lexical_cast.hpp\~ boost_1_53_0/boost/lexical_cast.hpp
|
||||||
|
--- boost_1_53_0/boost/lexical_cast.hpp~ 2012-12-29 15:41:23.000000000 +0100
|
||||||
|
+++ boost_1_53_0/boost/lexical_cast.hpp 2013-07-22 23:27:48.841566845 +0200
|
||||||
|
@@ -865,7 +865,6 @@ namespace boost {
|
||||||
|
#ifndef BOOST_NO_LIMITS_COMPILE_TIME_CONSTANTS
|
||||||
|
BOOST_STATIC_ASSERT(!std::numeric_limits<T>::is_signed);
|
||||||
|
#endif
|
||||||
|
- typedef typename Traits::int_type int_type;
|
||||||
|
CharT const czero = lcast_char_constants<CharT>::zero;
|
||||||
|
--end;
|
||||||
|
value = 0;
|
||||||
|
|
||||||
|
Diff finished. Mon Jul 22 23:28:02 2013
|
46
boost-1.53.0-math-unused_typedef-3.patch
Normal file
46
boost-1.53.0-math-unused_typedef-3.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
diff -urp boost_1_53_0-orig/boost/math/special_functions/detail/igamma_inverse.hpp boost_1_53_0/boost/math/special_functions/detail/igamma_inverse.hpp
|
||||||
|
--- boost_1_53_0-orig/boost/math/special_functions/detail/igamma_inverse.hpp 2013-07-23 01:32:21.874281840 +0200
|
||||||
|
+++ boost_1_53_0/boost/math/special_functions/detail/igamma_inverse.hpp 2013-07-23 01:34:15.291971260 +0200
|
||||||
|
@@ -341,7 +341,6 @@ struct gamma_p_inverse_func
|
||||||
|
// flag is set, then Q(x) - q and it's derivatives.
|
||||||
|
//
|
||||||
|
typedef typename policies::evaluation<T, Policy>::type value_type;
|
||||||
|
- typedef typename lanczos::lanczos<T, Policy>::type evaluation_type;
|
||||||
|
typedef typename policies::normalise<
|
||||||
|
Policy,
|
||||||
|
policies::promote_float<false>,
|
||||||
|
diff -urp boost_1_53_0-orig/boost/math/special_functions/gamma.hpp boost_1_53_0/boost/math/special_functions/gamma.hpp
|
||||||
|
--- boost_1_53_0-orig/boost/math/special_functions/gamma.hpp 2013-07-23 01:32:21.824281537 +0200
|
||||||
|
+++ boost_1_53_0/boost/math/special_functions/gamma.hpp 2013-07-23 01:34:15.322971451 +0200
|
||||||
|
@@ -1360,7 +1360,6 @@ inline typename tools::promote_args<T1,
|
||||||
|
BOOST_FPU_EXCEPTION_GUARD
|
||||||
|
typedef typename tools::promote_args<T1, T2>::type result_type;
|
||||||
|
typedef typename policies::evaluation<result_type, Policy>::type value_type;
|
||||||
|
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
|
||||||
|
typedef typename policies::normalise<
|
||||||
|
Policy,
|
||||||
|
policies::promote_float<false>,
|
||||||
|
@@ -1489,7 +1488,6 @@ inline typename tools::promote_args<T1,
|
||||||
|
BOOST_FPU_EXCEPTION_GUARD
|
||||||
|
typedef typename tools::promote_args<T1, T2>::type result_type;
|
||||||
|
typedef typename policies::evaluation<result_type, Policy>::type value_type;
|
||||||
|
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
|
||||||
|
typedef typename policies::normalise<
|
||||||
|
Policy,
|
||||||
|
policies::promote_float<false>,
|
||||||
|
@@ -1520,7 +1518,6 @@ inline typename tools::promote_args<T1,
|
||||||
|
BOOST_FPU_EXCEPTION_GUARD
|
||||||
|
typedef typename tools::promote_args<T1, T2>::type result_type;
|
||||||
|
typedef typename policies::evaluation<result_type, Policy>::type value_type;
|
||||||
|
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
|
||||||
|
typedef typename policies::normalise<
|
||||||
|
Policy,
|
||||||
|
policies::promote_float<false>,
|
||||||
|
@@ -1551,7 +1548,6 @@ inline typename tools::promote_args<T1,
|
||||||
|
BOOST_FPU_EXCEPTION_GUARD
|
||||||
|
typedef typename tools::promote_args<T1, T2>::type result_type;
|
||||||
|
typedef typename policies::evaluation<result_type, Policy>::type value_type;
|
||||||
|
- typedef typename lanczos::lanczos<value_type, Policy>::type evaluation_type;
|
||||||
|
typedef typename policies::normalise<
|
||||||
|
Policy,
|
||||||
|
policies::promote_float<false>,
|
65
boost-1.53.0-regex-unused_typedef.patch
Normal file
65
boost-1.53.0-regex-unused_typedef.patch
Normal file
@ -0,0 +1,65 @@
|
|||||||
|
diff -up ./boost/regex/icu.hpp~ ./boost/regex/icu.hpp
|
||||||
|
--- ./boost/regex/icu.hpp~ 2011-10-16 14:19:37.000000000 +0200
|
||||||
|
+++ ./boost/regex/icu.hpp 2013-07-22 23:32:44.346321967 +0200
|
||||||
|
@@ -423,7 +423,6 @@ bool do_regex_match(BidiIterator first,
|
||||||
|
{
|
||||||
|
typedef u16_to_u32_iterator<BidiIterator, UChar32> conv_type;
|
||||||
|
typedef match_results<conv_type> match_type;
|
||||||
|
- typedef typename match_type::allocator_type alloc_type;
|
||||||
|
match_type what;
|
||||||
|
bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
|
||||||
|
// copy results across to m:
|
||||||
|
@@ -439,7 +438,6 @@ bool do_regex_match(BidiIterator first,
|
||||||
|
{
|
||||||
|
typedef u8_to_u32_iterator<BidiIterator, UChar32> conv_type;
|
||||||
|
typedef match_results<conv_type> match_type;
|
||||||
|
- typedef typename match_type::allocator_type alloc_type;
|
||||||
|
match_type what;
|
||||||
|
bool result = ::boost::regex_match(conv_type(first, first, last), conv_type(last, first, last), what, e, flags);
|
||||||
|
// copy results across to m:
|
||||||
|
@@ -598,7 +596,6 @@ bool do_regex_search(BidiIterator first,
|
||||||
|
{
|
||||||
|
typedef u16_to_u32_iterator<BidiIterator, UChar32> conv_type;
|
||||||
|
typedef match_results<conv_type> match_type;
|
||||||
|
- typedef typename match_type::allocator_type alloc_type;
|
||||||
|
match_type what;
|
||||||
|
bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
|
||||||
|
// copy results across to m:
|
||||||
|
@@ -615,7 +612,6 @@ bool do_regex_search(BidiIterator first,
|
||||||
|
{
|
||||||
|
typedef u8_to_u32_iterator<BidiIterator, UChar32> conv_type;
|
||||||
|
typedef match_results<conv_type> match_type;
|
||||||
|
- typedef typename match_type::allocator_type alloc_type;
|
||||||
|
match_type what;
|
||||||
|
bool result = ::boost::regex_search(conv_type(first, first, last), conv_type(last, first, last), what, e, flags, conv_type(base));
|
||||||
|
// copy results across to m:
|
||||||
|
diff -up ./boost/regex/v4/regex_format.hpp~ ./boost/regex/v4/regex_format.hpp
|
||||||
|
--- ./boost/regex/v4/regex_format.hpp~ 2012-05-24 12:03:48.000000000 +0200
|
||||||
|
+++ ./boost/regex/v4/regex_format.hpp 2013-07-22 23:31:06.466740621 +0200
|
||||||
|
@@ -1064,7 +1064,6 @@ struct format_functor_c_string
|
||||||
|
template <class OutputIter>
|
||||||
|
OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
|
||||||
|
{
|
||||||
|
- typedef typename Match::char_type char_type;
|
||||||
|
const charT* end = func;
|
||||||
|
while(*end) ++end;
|
||||||
|
return regex_format_imp(i, m, func, end, f, t);
|
||||||
|
@@ -1083,7 +1082,6 @@ struct format_functor_container
|
||||||
|
template <class OutputIter>
|
||||||
|
OutputIter operator()(const Match& m, OutputIter i, boost::regex_constants::match_flag_type f, const Traits& t = Traits())
|
||||||
|
{
|
||||||
|
- typedef typename Match::char_type char_type;
|
||||||
|
return re_detail::regex_format_imp(i, m, func.begin(), func.end(), f, t);
|
||||||
|
}
|
||||||
|
private:
|
||||||
|
diff -up ./boost/regex/v4/regex_split.hpp~ ./boost/regex/v4/regex_split.hpp
|
||||||
|
--- ./boost/regex/v4/regex_split.hpp~ 2007-11-25 19:07:19.000000000 +0100
|
||||||
|
+++ ./boost/regex/v4/regex_split.hpp 2013-07-22 23:31:29.098875039 +0200
|
||||||
|
@@ -107,7 +107,6 @@ std::size_t regex_split(OutputIterator o
|
||||||
|
std::size_t max_split)
|
||||||
|
{
|
||||||
|
typedef typename std::basic_string<charT, Traits1, Alloc1>::const_iterator ci_t;
|
||||||
|
- typedef typename match_results<ci_t>::allocator_type match_allocator;
|
||||||
|
ci_t last = s.begin();
|
||||||
|
std::size_t init_size = max_split;
|
||||||
|
re_detail::split_pred<OutputIterator, charT, Traits1, Alloc1> pred(&last, &out, &max_split);
|
30
boost-1.53.0-static_assert-unused_typedef.patch
Normal file
30
boost-1.53.0-static_assert-unused_typedef.patch
Normal file
@ -0,0 +1,30 @@
|
|||||||
|
diff -up boost_1_53_0/boost/static_assert.hpp\~ boost_1_53_0/boost/static_assert.hpp
|
||||||
|
--- boost_1_53_0/boost/static_assert.hpp~ 2012-12-11 15:42:26.000000000 +0100
|
||||||
|
+++ boost_1_53_0/boost/static_assert.hpp 2013-07-19 14:15:59.504039071 +0200
|
||||||
|
@@ -43,6 +43,14 @@
|
||||||
|
#else
|
||||||
|
# define BOOST_STATIC_ASSERT_BOOL_CAST(x) (bool)(x)
|
||||||
|
#endif
|
||||||
|
+//
|
||||||
|
+// If the compiler warns about unused typedefs then enable this:
|
||||||
|
+//
|
||||||
|
+#if defined(__GNUC__) && ((__GNUC__ > 4) || ((__GNUC__ == 4) && (__GNUC_MINOR__ >= 7)))
|
||||||
|
+# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE __attribute__((unused))
|
||||||
|
+#else
|
||||||
|
+# define BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#ifndef BOOST_NO_CXX11_STATIC_ASSERT
|
||||||
|
# define BOOST_STATIC_ASSERT( B ) static_assert(B, #B)
|
||||||
|
@@ -122,7 +130,8 @@ template<int x> struct static_assert_tes
|
||||||
|
#define BOOST_STATIC_ASSERT( B ) \
|
||||||
|
typedef ::boost::static_assert_test<\
|
||||||
|
sizeof(::boost::STATIC_ASSERTION_FAILURE< BOOST_STATIC_ASSERT_BOOL_CAST( B ) >)>\
|
||||||
|
- BOOST_JOIN(boost_static_assert_typedef_, __LINE__)
|
||||||
|
+ BOOST_JOIN(boost_static_assert_typedef_, __LINE__) \
|
||||||
|
+ BOOST_STATIC_ASSERT_UNUSED_ATTRIBUTE
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#else
|
||||||
|
|
||||||
|
Diff finished. Fri Jul 19 14:16:04 2013
|
26
boost-1.53.0-thread-unused_typedef.patch
Normal file
26
boost-1.53.0-thread-unused_typedef.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
diff -up boost_1_53_0/boost/thread/future.hpp\~ boost_1_53_0/boost/thread/future.hpp
|
||||||
|
--- boost_1_53_0/boost/thread/future.hpp~ 2012-12-16 20:01:45.000000000 +0100
|
||||||
|
+++ boost_1_53_0/boost/thread/future.hpp 2013-07-23 16:50:27.044995968 +0200
|
||||||
|
@@ -2911,10 +2913,6 @@ namespace boost
|
||||||
|
{
|
||||||
|
typedef typename boost::result_of<typename decay<F>::type()>::type R;
|
||||||
|
typedef packaged_task<R()> packaged_task_type;
|
||||||
|
-
|
||||||
|
- typedef detail::async_func<typename decay<F>::type> BF;
|
||||||
|
- typedef typename BF::result_type Rp;
|
||||||
|
-
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
template <class F>
|
||||||
|
@@ -2925,9 +2924,6 @@ namespace boost
|
||||||
|
{
|
||||||
|
typedef typename boost::result_of<typename decay<F>::type()>::type R;
|
||||||
|
typedef packaged_task<R> packaged_task_type;
|
||||||
|
-
|
||||||
|
- typedef detail::async_func<typename decay<F>::type> BF;
|
||||||
|
- typedef typename BF::result_type Rp;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
if (int(policy) & int(launch::async))
|
||||||
|
|
||||||
|
Diff finished. Tue Jul 23 16:50:30 2013
|
11
boost-1.54.0-locale-unused_typedef.patch
Normal file
11
boost-1.54.0-locale-unused_typedef.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -urp boost_1_54_0-orig/boost/locale/boundary/segment.hpp boost_1_54_0/boost/locale/boundary/segment.hpp
|
||||||
|
--- boost_1_54_0-orig/boost/locale/boundary/segment.hpp 2013-07-23 00:47:27.020787174 +0200
|
||||||
|
+++ boost_1_54_0/boost/locale/boundary/segment.hpp 2013-07-23 00:50:40.382959016 +0200
|
||||||
|
@@ -27,7 +27,6 @@ namespace boundary {
|
||||||
|
int compare_text(LeftIterator l_begin,LeftIterator l_end,RightIterator r_begin,RightIterator r_end)
|
||||||
|
{
|
||||||
|
typedef LeftIterator left_iterator;
|
||||||
|
- typedef RightIterator right_iterator;
|
||||||
|
typedef typename std::iterator_traits<left_iterator>::value_type char_type;
|
||||||
|
typedef std::char_traits<char_type> traits;
|
||||||
|
while(l_begin!=l_end && r_begin!=r_end) {
|
24
boost-1.54.0-random-unused_typedef.patch
Normal file
24
boost-1.54.0-random-unused_typedef.patch
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
Index: boost/random/generate_canonical.hpp
|
||||||
|
===================================================================
|
||||||
|
--- boost/random/generate_canonical.hpp (revision 85073)
|
||||||
|
+++ boost/random/generate_canonical.hpp (working copy)
|
||||||
|
@@ -54,7 +54,6 @@
|
||||||
|
using std::floor;
|
||||||
|
BOOST_ASSERT((g.min)() == 0);
|
||||||
|
BOOST_ASSERT((g.max)() == 1);
|
||||||
|
- typedef typename URNG::result_type base_result;
|
||||||
|
std::size_t digits = std::numeric_limits<RealType>::digits;
|
||||||
|
std::size_t engine_bits = detail::generator_bits<URNG>::value();
|
||||||
|
std::size_t b = (std::min)(bits, digits);
|
||||||
|
Index: boost/random/uniform_real_distribution.hpp
|
||||||
|
===================================================================
|
||||||
|
--- boost/random/uniform_real_distribution.hpp (revision 85073)
|
||||||
|
+++ boost/random/uniform_real_distribution.hpp (working copy)
|
||||||
|
@@ -36,7 +36,6 @@
|
||||||
|
{
|
||||||
|
for(;;) {
|
||||||
|
typedef T result_type;
|
||||||
|
- typedef typename Engine::result_type base_result;
|
||||||
|
result_type numerator = static_cast<T>(eng() - (eng.min)());
|
||||||
|
result_type divisor = static_cast<T>((eng.max)() - (eng.min)());
|
||||||
|
BOOST_ASSERT(divisor > 0);
|
31
boost-1.57.0-mpl-print.patch
Normal file
31
boost-1.57.0-mpl-print.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff -up boost_1_57_0/boost/mpl/print.hpp\~ boost_1_57_0/boost/mpl/print.hpp
|
||||||
|
--- boost_1_57_0/boost/mpl/print.hpp~ 2014-07-09 23:12:31.000000000 +0200
|
||||||
|
+++ boost_1_57_0/boost/mpl/print.hpp 2015-01-20 12:44:59.621400948 +0100
|
||||||
|
@@ -52,16 +52,15 @@ struct print
|
||||||
|
enum { n = sizeof(T) + -1 };
|
||||||
|
#elif defined(__MWERKS__)
|
||||||
|
void f(int);
|
||||||
|
-#else
|
||||||
|
- enum {
|
||||||
|
- n =
|
||||||
|
-# if defined(__EDG_VERSION__)
|
||||||
|
- aux::dependent_unsigned<T>::value > -1
|
||||||
|
-# else
|
||||||
|
- sizeof(T) > -1
|
||||||
|
-# endif
|
||||||
|
- };
|
||||||
|
-#endif
|
||||||
|
+#elif defined(__EDG_VERSION__)
|
||||||
|
+ enum { n = aux::dependent_unsigned<T>::value > -1 };
|
||||||
|
+#elif defined(BOOST_GCC)
|
||||||
|
+ enum { n1 };
|
||||||
|
+ enum { n2 };
|
||||||
|
+ enum { n = n1 != n2 };
|
||||||
|
+#else
|
||||||
|
+ enum { n = sizeof(T) > -1 };
|
||||||
|
+#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
#if defined(BOOST_MSVC)
|
||||||
|
|
||||||
|
Diff finished. Tue Jan 20 12:45:03 2015
|
13
boost-1.57.0-python-libpython_dep.patch
Normal file
13
boost-1.57.0-python-libpython_dep.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: boost_1_57_0/tools/build/src/tools/python.jam
|
||||||
|
===================================================================
|
||||||
|
--- boost_1_57_0/tools/build/src/tools/python.jam (revision 50406)
|
||||||
|
+++ boost_1_57_0/tools/build/src/tools/python.jam (working copy)
|
||||||
|
@@ -994,7 +994,7 @@
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alias python_for_extensions
|
||||||
|
- :
|
||||||
|
+ : python
|
||||||
|
: $(target-requirements)
|
||||||
|
:
|
||||||
|
: $(usage-requirements)
|
31
boost-1.58.0-pool-test_linking.patch
Normal file
31
boost-1.58.0-pool-test_linking.patch
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
diff -up boost_1_58_0/libs/pool/test/Jamfile.v2\~ boost_1_58_0/libs/pool/test/Jamfile.v2
|
||||||
|
--- boost_1_57_0/libs/pool/test/Jamfile.v2~ 2015-07-17 11:36:16.362519826 +0100
|
||||||
|
+++ boost_1_57_0/libs/pool/test/Jamfile.v2 2015-07-17 11:37:38.858847388 +0100
|
||||||
|
@@ -28,17 +28,17 @@
|
||||||
|
local Werr = <toolset>gcc:<warnings-as-errors>on <toolset>msvc:<warnings-as-errors>on ;
|
||||||
|
|
||||||
|
test-suite pool :
|
||||||
|
- [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 ]
|
||||||
|
- [ run test_pool_alloc.cpp : : : $(Werr) ]
|
||||||
|
- [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 ]
|
||||||
|
- [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) ]
|
||||||
|
- [ run test_bug_3349.cpp : : : $(Werr) ]
|
||||||
|
- [ run test_bug_4960.cpp : : : $(Werr) ]
|
||||||
|
- [ run test_bug_1252.cpp : : : $(Werr) ]
|
||||||
|
- [ run test_bug_2696.cpp : : : $(Werr) ]
|
||||||
|
- [ run test_bug_5526.cpp : : : $(Werr) ]
|
||||||
|
+ [ run test_simple_seg_storage.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4267 <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||||
|
+ [ run pool_msvc_compiler_bug_test.cpp : : : $(Werr) <toolset>msvc:<cxxflags>-wd4512 <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_msvc_mem_leak_detect.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_bug_3349.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_bug_4960.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_bug_1252.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_bug_2696.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||||
|
+ [ run test_bug_5526.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||||
|
[ run test_threading.cpp : : : <threading>multi <library>/boost/thread//boost_thread ]
|
||||||
|
- [ run ../example/time_pool_alloc.cpp : : : $(Werr) ]
|
||||||
|
+ [ run ../example/time_pool_alloc.cpp : : : $(Werr) <library>/boost/system//boost_system ]
|
||||||
|
[ compile test_poisoned_macros.cpp : $(Werr) ]
|
||||||
|
|
||||||
|
#
|
120
boost-1.58.0-pool.patch
Normal file
120
boost-1.58.0-pool.patch
Normal file
@ -0,0 +1,120 @@
|
|||||||
|
Index: boost/pool/pool.hpp
|
||||||
|
===================================================================
|
||||||
|
--- boost/pool/pool.hpp (revision 78317)
|
||||||
|
+++ boost/pool/pool.hpp (revision 78326)
|
||||||
|
@@ -27,4 +27,6 @@
|
||||||
|
#include <boost/pool/poolfwd.hpp>
|
||||||
|
|
||||||
|
+// std::numeric_limits
|
||||||
|
+#include <boost/limits.hpp>
|
||||||
|
// boost::integer::static_lcm
|
||||||
|
#include <boost/integer/common_factor_ct.hpp>
|
||||||
|
@@ -358,4 +360,11 @@
|
||||||
|
}
|
||||||
|
|
||||||
|
+ size_type max_chunks() const
|
||||||
|
+ { //! Calculated maximum number of memory chunks that can be allocated in a single call by this Pool.
|
||||||
|
+ size_type partition_size = alloc_size();
|
||||||
|
+ size_type POD_size = integer::static_lcm<sizeof(size_type), sizeof(void *)>::value + sizeof(size_type);
|
||||||
|
+ return (std::numeric_limits<size_type>::max() - POD_size) / alloc_size();
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
static void * & nextof(void * const ptr)
|
||||||
|
{ //! \returns Pointer dereferenced.
|
||||||
|
@@ -377,5 +388,7 @@
|
||||||
|
//! the first time that object needs to allocate system memory.
|
||||||
|
//! The default is 32. This parameter may not be 0.
|
||||||
|
- //! \param nmax_size is the maximum number of chunks to allocate in one block.
|
||||||
|
+ //! \param nmax_size is the maximum number of chunks to allocate in one block.
|
||||||
|
+ set_next_size(nnext_size);
|
||||||
|
+ set_max_size(nmax_size);
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -400,7 +413,7 @@
|
||||||
|
}
|
||||||
|
void set_next_size(const size_type nnext_size)
|
||||||
|
- { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
|
||||||
|
- //! \returns nnext_size.
|
||||||
|
- next_size = start_size = nnext_size;
|
||||||
|
+ { //! Set number of chunks to request from the system the next time that object needs to allocate system memory. This value should never be set to 0.
|
||||||
|
+ BOOST_USING_STD_MIN();
|
||||||
|
+ next_size = start_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nnext_size, max_chunks());
|
||||||
|
}
|
||||||
|
size_type get_max_size() const
|
||||||
|
@@ -410,5 +423,6 @@
|
||||||
|
void set_max_size(const size_type nmax_size)
|
||||||
|
{ //! Set max_size.
|
||||||
|
- max_size = nmax_size;
|
||||||
|
+ BOOST_USING_STD_MIN();
|
||||||
|
+ max_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(nmax_size, max_chunks());
|
||||||
|
}
|
||||||
|
size_type get_requested_size() const
|
||||||
|
@@ -713,7 +727,7 @@
|
||||||
|
BOOST_USING_STD_MIN();
|
||||||
|
if(!max_size)
|
||||||
|
- next_size <<= 1;
|
||||||
|
+ set_next_size(next_size << 1);
|
||||||
|
else if( next_size*partition_size/requested_size < max_size)
|
||||||
|
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||||
|
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
|
||||||
|
|
||||||
|
// initialize it,
|
||||||
|
@@ -753,7 +767,7 @@
|
||||||
|
BOOST_USING_STD_MIN();
|
||||||
|
if(!max_size)
|
||||||
|
- next_size <<= 1;
|
||||||
|
+ set_next_size(next_size << 1);
|
||||||
|
else if( next_size*partition_size/requested_size < max_size)
|
||||||
|
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||||
|
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
|
||||||
|
|
||||||
|
// initialize it,
|
||||||
|
@@ -797,4 +811,6 @@
|
||||||
|
//! \returns Address of chunk n if allocated ok.
|
||||||
|
//! \returns 0 if not enough memory for n chunks.
|
||||||
|
+ if (n > max_chunks())
|
||||||
|
+ return 0;
|
||||||
|
|
||||||
|
const size_type partition_size = alloc_size();
|
||||||
|
@@ -845,7 +861,7 @@
|
||||||
|
BOOST_USING_STD_MIN();
|
||||||
|
if(!max_size)
|
||||||
|
- next_size <<= 1;
|
||||||
|
+ set_next_size(next_size << 1);
|
||||||
|
else if( next_size*partition_size/requested_size < max_size)
|
||||||
|
- next_size = min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size*requested_size/ partition_size);
|
||||||
|
+ set_next_size(min BOOST_PREVENT_MACRO_SUBSTITUTION(next_size << 1, max_size * requested_size / partition_size));
|
||||||
|
|
||||||
|
// insert it into the list,
|
||||||
|
Index: libs/pool/test/test_bug_6701.cpp
|
||||||
|
===================================================================
|
||||||
|
--- libs/pool/test/test_bug_6701.cpp (revision 78326)
|
||||||
|
+++ libs/pool/test/test_bug_6701.cpp (revision 78326)
|
||||||
|
@@ -0,0 +1,27 @@
|
||||||
|
+/* Copyright (C) 2012 Étienne Dupuis
|
||||||
|
+*
|
||||||
|
+* Use, modification and distribution is subject to the
|
||||||
|
+* Boost Software License, Version 1.0. (See accompanying
|
||||||
|
+* file LICENSE_1_0.txt or http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
+*/
|
||||||
|
+
|
||||||
|
+// Test of bug #6701 (https://svn.boost.org/trac/boost/ticket/6701)
|
||||||
|
+
|
||||||
|
+#include <boost/pool/object_pool.hpp>
|
||||||
|
+#include <boost/limits.hpp>
|
||||||
|
+
|
||||||
|
+int main()
|
||||||
|
+{
|
||||||
|
+ boost::pool<> p(1024, std::numeric_limits<size_t>::max() / 768);
|
||||||
|
+
|
||||||
|
+ void *x = p.malloc();
|
||||||
|
+ BOOST_ASSERT(!x);
|
||||||
|
+
|
||||||
|
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_next_size());
|
||||||
|
+ BOOST_ASSERT(std::numeric_limits<size_t>::max() / 1024 >= p.get_max_size());
|
||||||
|
+
|
||||||
|
+ void *y = p.ordered_malloc(std::numeric_limits<size_t>::max() / 768);
|
||||||
|
+ BOOST_ASSERT(!y);
|
||||||
|
+
|
||||||
|
+ return 0;
|
||||||
|
+}
|
87
boost-1.63.0-dual-python-build-v2.patch
Normal file
87
boost-1.63.0-dual-python-build-v2.patch
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
--- boost_1_63_0/libs/mpi/build/Jamfile.v2 2016-12-22 06:33:17.000000000 -0600
|
||||||
|
+++ boost_1_63_0/libs/mpi/build/Jamfile.v2 2017-05-19 01:45:05.485563800 -0500
|
||||||
|
@@ -11,6 +11,7 @@
|
||||||
|
import mpi ;
|
||||||
|
import indirect ;
|
||||||
|
import python ;
|
||||||
|
+import feature ;
|
||||||
|
|
||||||
|
libraries = ;
|
||||||
|
|
||||||
|
@@ -53,18 +54,38 @@ lib boost_mpi
|
||||||
|
<library>../../serialization/build//boost_serialization
|
||||||
|
<library>/mpi//mpi [ mpi.extra-requirements ]
|
||||||
|
;
|
||||||
|
+
|
||||||
|
+rule cond ( test ? : yes * : no * ) { if $(test) { return $(yes) ; } else { return $(no) ; } }
|
||||||
|
|
||||||
|
libraries += boost_mpi ;
|
||||||
|
+rule find-py3-version
|
||||||
|
+{
|
||||||
|
+ local versions = [ feature.values python ] ;
|
||||||
|
+ local py3ver ;
|
||||||
|
+ for local v in $(versions)
|
||||||
|
+ {
|
||||||
|
+ if $(v) >= 3.0
|
||||||
|
+ {
|
||||||
|
+ py3ver = $(v) ;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ return $(py3ver) ;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+py3-version = [ find-py3-version ] ;
|
||||||
|
|
||||||
|
if [ python.configured ]
|
||||||
|
{
|
||||||
|
- lib boost_mpi_python
|
||||||
|
+
|
||||||
|
+ rule lib_boost_mpi_python ( is-py3 ? ) {
|
||||||
|
+
|
||||||
|
+ lib [ cond $(is-py3) : boost_mpi_python3 : boost_mpi_python ]
|
||||||
|
: # Sources
|
||||||
|
python/serialize.cpp
|
||||||
|
: # Requirements
|
||||||
|
<library>boost_mpi
|
||||||
|
<library>/mpi//mpi [ mpi.extra-requirements ]
|
||||||
|
- <library>/boost/python//boost_python
|
||||||
|
+ [ cond $(is-py3) : <library>/boost/python//boost_python3 : <library>/boost/python//boost_python ]
|
||||||
|
<link>shared:<define>BOOST_MPI_DYN_LINK=1
|
||||||
|
<link>shared:<define>BOOST_MPI_PYTHON_DYN_LINK=1
|
||||||
|
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
|
||||||
|
@@ -76,7 +97,6 @@ libraries += boost_mpi ;
|
||||||
|
: # Usage requirements
|
||||||
|
<library>/mpi//mpi [ mpi.extra-requirements ]
|
||||||
|
;
|
||||||
|
- libraries += boost_mpi_python ;
|
||||||
|
|
||||||
|
python-extension mpi
|
||||||
|
: # Sources
|
||||||
|
@@ -93,8 +113,8 @@ libraries += boost_mpi ;
|
||||||
|
python/status.cpp
|
||||||
|
python/py_timer.cpp
|
||||||
|
: # Requirements
|
||||||
|
- <library>/boost/python//boost_python
|
||||||
|
- <library>boost_mpi_python
|
||||||
|
+ [ cond $(is-py3) : <library>/boost/python//boost_python3 : <library>/boost/python//boost_python ]
|
||||||
|
+ [ cond $(is-py3) : <library>boost_mpi_python3 : <library>boost_mpi_python ]
|
||||||
|
<library>boost_mpi
|
||||||
|
<library>/mpi//mpi [ mpi.extra-requirements ]
|
||||||
|
<link>shared:<define>BOOST_MPI_DYN_LINK=1
|
||||||
|
@@ -102,6 +122,16 @@ libraries += boost_mpi ;
|
||||||
|
<link>shared:<define>BOOST_PYTHON_DYN_LINK=1
|
||||||
|
<link>shared <runtime-link>shared
|
||||||
|
;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ if $(py3-version) {
|
||||||
|
+ lib_boost_mpi_python yes ;
|
||||||
|
+ libraries += boost_mpi_python3 ;
|
||||||
|
+ } else {
|
||||||
|
+ lib_boost_mpi_python ;
|
||||||
|
+ libraries += boost_mpi_python ;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if ! ( --without-mpi in [ modules.peek : ARGV ] )
|
13
boost-1.66.0-address-model.patch
Normal file
13
boost-1.66.0-address-model.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:09:56.041685502 +0000
|
||||||
|
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:09:56.042685500 +0000
|
||||||
|
@@ -421,7 +421,9 @@
|
||||||
|
|
||||||
|
rule set-address-model-options ( targets * : sources * : properties * )
|
||||||
|
{
|
||||||
|
- local model = [ feature.get-values address-model : $(properties) ] ;
|
||||||
|
+ # For RPM builds the address model flag is passed in %{optflags}.
|
||||||
|
+ # local model = [ feature.get-values address-model : $(properties) ] ;
|
||||||
|
+ local model ;
|
||||||
|
if $(model)
|
||||||
|
{
|
||||||
|
local option ;
|
26
boost-1.66.0-bjam-build-flags.patch
Normal file
26
boost-1.66.0-bjam-build-flags.patch
Normal file
@ -0,0 +1,26 @@
|
|||||||
|
--- boost_1_66_0/tools/build/src/engine/build.jam~ 2018-02-07 21:36:14.552201421 +0000
|
||||||
|
+++ boost_1_66_0/tools/build/src/engine/build.jam 2018-02-07 21:36:29.014173266 +0000
|
||||||
|
@@ -4,7 +4,7 @@
|
||||||
|
#~ http://www.boost.org/LICENSE_1_0.txt)
|
||||||
|
|
||||||
|
# Clean env vars of any "extra" empty values.
|
||||||
|
-for local v in ARGV CC CFLAGS LIBS
|
||||||
|
+for local v in ARGV CC CFLAGS LIBS RPM_OPT_FLAGS RPM_LD_FLAGS
|
||||||
|
{
|
||||||
|
local values ;
|
||||||
|
for local x in $($(v))
|
||||||
|
@@ -215,12 +215,12 @@
|
||||||
|
: -L$(--python-lib[1]) -l$(--python-lib[2]) ;
|
||||||
|
## GCC 2.x, 3.x, 4.x
|
||||||
|
toolset gcc gcc : "-o " : -D
|
||||||
|
- : -pedantic -fno-strict-aliasing
|
||||||
|
+ : -pedantic -fno-strict-aliasing $(RPM_OPT_FLAGS)
|
||||||
|
[ opt --release : [ opt --symbols : -g : -s ] -O3 ]
|
||||||
|
[ opt --debug : -g -O0 -fno-inline ]
|
||||||
|
[ opt --profile : -O3 -g -pg ]
|
||||||
|
-I$(--python-include) -I$(--extra-include) -Wno-long-long
|
||||||
|
- : -L$(--python-lib[1]) -l$(--python-lib[2]) ;
|
||||||
|
+ : -L$(--python-lib[1]) -l$(--python-lib[2]) $(RPM_LD_FLAGS) ;
|
||||||
|
## GCC 2.x, 3.x on CYGWIN but without cygwin1.dll
|
||||||
|
toolset gcc-nocygwin gcc : "-o " : -D
|
||||||
|
: -s -O3 -mno-cygwin
|
49
boost-1.66.0-build-optflags.patch
Normal file
49
boost-1.66.0-build-optflags.patch
Normal file
@ -0,0 +1,49 @@
|
|||||||
|
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2017-12-13 23:56:50.000000000 +0000
|
||||||
|
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 12:48:26.264755316 +0000
|
||||||
|
@@ -603,7 +603,7 @@ rule compile.fortran ( targets * : sourc
|
||||||
|
|
||||||
|
actions compile.c++ bind PCH_FILE
|
||||||
|
{
|
||||||
|
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
|
||||||
|
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" -c -o "$(<:W)" "$(>:W)"
|
||||||
|
}
|
||||||
|
|
||||||
|
actions compile.c bind PCH_FILE
|
||||||
|
@@ -613,7 +613,7 @@ actions compile.c bind PCH_FILE
|
||||||
|
|
||||||
|
actions compile.c++.preprocess bind PCH_FILE
|
||||||
|
{
|
||||||
|
- "$(CONFIG_COMMAND)" $(LANG) -ftemplate-depth-$(TEMPLATE_DEPTH) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
|
||||||
|
+ "$(CONFIG_COMMAND)" $(LANG) $(OPTIONS) $(USER_OPTIONS) -D$(DEFINES) -I"$(PCH_FILE:D)" -I"$(INCLUDES)" "$(>:W)" -E >"$(<:W)"
|
||||||
|
}
|
||||||
|
|
||||||
|
actions compile.c.preprocess bind PCH_FILE
|
||||||
|
@@ -755,17 +755,17 @@ actions compile.c.pch
|
||||||
|
###
|
||||||
|
|
||||||
|
# Declare flags and action for compilation.
|
||||||
|
-toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
||||||
|
-
|
||||||
|
-toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <inlining>on : -Wno-inline ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <inlining>full : -finline-functions -Wno-inline ;
|
||||||
|
-
|
||||||
|
-toolset.flags gcc.compile OPTIONS <warnings>off : -w ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <warnings>on : -Wall ;
|
||||||
|
-toolset.flags gcc.compile OPTIONS <warnings>all : -Wall -pedantic ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <optimization>off : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <optimization>speed : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <optimization>space : ;
|
||||||
|
+
|
||||||
|
+toolset.flags gcc.compile OPTIONS <inlining>off : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <inlining>on : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <inlining>full : ;
|
||||||
|
+
|
||||||
|
+toolset.flags gcc.compile OPTIONS <warnings>off : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <warnings>on : ;
|
||||||
|
+toolset.flags gcc.compile OPTIONS <warnings>all : ;
|
||||||
|
toolset.flags gcc.compile OPTIONS <warnings-as-errors>on : -Werror ;
|
||||||
|
|
||||||
|
toolset.flags gcc.compile OPTIONS <debug-symbols>on : -g ;
|
23
boost-1.66.0-compute.patch
Normal file
23
boost-1.66.0-compute.patch
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
From fdbdb94db64e888fce90fe519be23c2a4396a82e Mon Sep 17 00:00:00 2001
|
||||||
|
From: pradeep <pradeep@arrayfire.com>
|
||||||
|
Date: Tue, 8 May 2018 14:53:38 +0530
|
||||||
|
Subject: [PATCH 1/2] Fix return var qualifier in svm_ptr::get_context
|
||||||
|
|
||||||
|
Lack of `const` qualifier is throwing errors with GCC 8.1
|
||||||
|
---
|
||||||
|
include/boost/compute/memory/svm_ptr.hpp | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/include/boost/compute/memory/svm_ptr.hpp b/include/boost/compute/memory/svm_ptr.hpp
|
||||||
|
index c8753f5b..56cf1268 100644
|
||||||
|
--- a/include/boost/compute/memory/svm_ptr.hpp
|
||||||
|
+++ b/include/boost/compute/memory/svm_ptr.hpp
|
||||||
|
@@ -126,7 +126,7 @@ class svm_ptr
|
||||||
|
return m_ptr - other.m_ptr;
|
||||||
|
}
|
||||||
|
|
||||||
|
- context& get_context() const
|
||||||
|
+ const context& get_context() const
|
||||||
|
{
|
||||||
|
return m_context;
|
||||||
|
}
|
20
boost-1.66.0-no-rpath.patch
Normal file
20
boost-1.66.0-no-rpath.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
--- boost_1_66_0/tools/build/src/tools/gcc.jam~ 2018-01-19 13:23:45.361330881 +0000
|
||||||
|
+++ boost_1_66_0/tools/build/src/tools/gcc.jam 2018-01-19 13:23:45.362330880 +0000
|
||||||
|
@@ -1191,7 +1191,7 @@ rule link ( targets * : sources * : prop
|
||||||
|
|
||||||
|
actions link bind LIBRARIES
|
||||||
|
{
|
||||||
|
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) -Wl,-rpath-link$(SPACE)-Wl,"$(RPATH_LINK)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||||
|
+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -o "$(<)" $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||||
|
}
|
||||||
|
|
||||||
|
rule link.dll ( targets * : sources * : properties * )
|
||||||
|
@@ -1204,7 +1204,7 @@ rule link.dll ( targets * : sources * :
|
||||||
|
# Differs from 'link' above only by -shared.
|
||||||
|
actions link.dll bind LIBRARIES
|
||||||
|
{
|
||||||
|
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,$(RPATH) "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||||
|
+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
||||||
|
}
|
||||||
|
|
||||||
|
###
|
62
boost-1.66.0-python-abi_letters.patch
Normal file
62
boost-1.66.0-python-abi_letters.patch
Normal file
@ -0,0 +1,62 @@
|
|||||||
|
--- boost_1_57_0/tools/build/src/tools/python.jam 2013-05-21 06:14:18.000000000 +0200
|
||||||
|
+++ boost_1_55_0/tools/build/src/tools/python.jam 2014-05-29 19:09:12.115413877 +0200
|
||||||
|
@@ -94,7 +94,7 @@ feature.feature pythonpath : : free opti
|
||||||
|
# using python : 2.3 : /usr/local/bin/python ;
|
||||||
|
#
|
||||||
|
rule init ( version ? : cmd-or-prefix ? : includes * : libraries ?
|
||||||
|
- : condition * : extension-suffix ? )
|
||||||
|
+ : condition * : extension-suffix ? : abi-letters ? )
|
||||||
|
{
|
||||||
|
project.push-current $(.project) ;
|
||||||
|
|
||||||
|
@@ -107,7 +107,7 @@ rule init ( version ? : cmd-or-prefix ?
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) ;
|
||||||
|
+ configure $(version) : $(cmd-or-prefix) : $(includes) : $(libraries) : $(condition) : $(extension-suffix) : $(abi-letters) ;
|
||||||
|
|
||||||
|
project.pop-current ;
|
||||||
|
}
|
||||||
|
@@ -653,7 +653,7 @@ local rule system-library-dependencies (
|
||||||
|
|
||||||
|
# Declare a target to represent Python's library.
|
||||||
|
#
|
||||||
|
-local rule declare-libpython-target ( version ? : requirements * )
|
||||||
|
+local rule declare-libpython-target ( version ? : requirements * : abi-letters ? )
|
||||||
|
{
|
||||||
|
# Compute the representation of Python version in the name of Python's
|
||||||
|
# library file.
|
||||||
|
@@ -677,13 +677,13 @@ local rule declare-libpython-target ( ve
|
||||||
|
}
|
||||||
|
|
||||||
|
# Declare it.
|
||||||
|
- lib python.lib : : <name>python$(lib-version) $(requirements) ;
|
||||||
|
+ lib python.lib : : <name>python$(lib-version)$(abi-letters) $(requirements) ;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Implementation of init.
|
||||||
|
local rule configure ( version ? : cmd-or-prefix ? : includes * : libraries ? :
|
||||||
|
- condition * : extension-suffix ? )
|
||||||
|
+ condition * : extension-suffix ? : abi-letters ? )
|
||||||
|
{
|
||||||
|
local prefix ;
|
||||||
|
local exec-prefix ;
|
||||||
|
@@ -699,6 +699,7 @@ local rule configure ( version ? : cmd-o
|
||||||
|
extension-suffix ?= _d ;
|
||||||
|
}
|
||||||
|
extension-suffix ?= "" ;
|
||||||
|
+ abi-letters ?= "" ;
|
||||||
|
|
||||||
|
local cmds-to-try ;
|
||||||
|
|
||||||
|
@@ -922,7 +923,7 @@ local rule configure ( version ? : cmd-o
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
- declare-libpython-target $(version) : $(target-requirements) ;
|
||||||
|
+ declare-libpython-target $(version) : $(target-requirements) : $(abi-letters) ;
|
||||||
|
|
||||||
|
# This is an evil hack. On, Windows, when Python is embedded, nothing
|
||||||
|
# seems to set up sys.path to include Python's standard library
|
39
boost-1.66.0-python37.patch
Normal file
39
boost-1.66.0-python37.patch
Normal file
@ -0,0 +1,39 @@
|
|||||||
|
From 660487c43fde76f3e64f1cb2e644500da92fe582 Mon Sep 17 00:00:00 2001
|
||||||
|
From: =?UTF-8?q?Bernhard=20Rosenkr=C3=A4nzer?= <bero@lindev.ch>
|
||||||
|
Date: Fri, 9 Feb 2018 18:20:30 +0100
|
||||||
|
Subject: [PATCH] Fix build with Python 3.7
|
||||||
|
MIME-Version: 1.0
|
||||||
|
Content-Type: text/plain; charset=UTF-8
|
||||||
|
Content-Transfer-Encoding: 8bit
|
||||||
|
|
||||||
|
Python 3.7 changes the return type of _PyUnicode_AsString()
|
||||||
|
from void* to const char* -- causing the build of boost-python
|
||||||
|
to fail.
|
||||||
|
|
||||||
|
Signed-off-by: Bernhard Rosenkränzer <bero@lindev.ch>
|
||||||
|
---
|
||||||
|
src/converter/builtin_converters.cpp | 7 ++++++-
|
||||||
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/src/converter/builtin_converters.cpp b/src/converter/builtin_converters.cpp
|
||||||
|
index 1c28af7fc..ee2d5b479 100644
|
||||||
|
--- a/libs/python/src/converter/builtin_converters.cpp
|
||||||
|
+++ b/libs/python/src/converter/builtin_converters.cpp
|
||||||
|
@@ -45,11 +45,16 @@ namespace
|
||||||
|
{
|
||||||
|
return PyString_Check(obj) ? PyString_AsString(obj) : 0;
|
||||||
|
}
|
||||||
|
-#else
|
||||||
|
+#elif PY_VERSION_HEX < 0x03070000
|
||||||
|
void* convert_to_cstring(PyObject* obj)
|
||||||
|
{
|
||||||
|
return PyUnicode_Check(obj) ? _PyUnicode_AsString(obj) : 0;
|
||||||
|
}
|
||||||
|
+#else
|
||||||
|
+ void* convert_to_cstring(PyObject* obj)
|
||||||
|
+ {
|
||||||
|
+ return PyUnicode_Check(obj) ? const_cast<void*>(reinterpret_cast<const void*>(_PyUnicode_AsString(obj))) : 0;
|
||||||
|
+ }
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Given a target type and a SlotPolicy describing how to perform a
|
15
boost-1.66.0-spirit-abs-overflow.patch
Normal file
15
boost-1.66.0-spirit-abs-overflow.patch
Normal file
@ -0,0 +1,15 @@
|
|||||||
|
--- boost_1_66_0/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp~ 2018-02-23 16:59:53.785141676 +0000
|
||||||
|
+++ boost_1_66_0/boost/spirit/home/karma/numeric/detail/numeric_utils.hpp 2018-02-23 17:00:16.838092946 +0000
|
||||||
|
@@ -68,7 +68,11 @@
|
||||||
|
typedef unsignedtype type; \
|
||||||
|
static type call(signedtype n) \
|
||||||
|
{ \
|
||||||
|
- return static_cast<unsignedtype>((n >= 0) ? n : -n); \
|
||||||
|
+ if (n >= 0) \
|
||||||
|
+ return n; \
|
||||||
|
+ if (n == std::numeric_limits<signedtype>::min()) \
|
||||||
|
+ return (unsignedtype)n; \
|
||||||
|
+ return (unsignedtype)(-n); \
|
||||||
|
} \
|
||||||
|
} \
|
||||||
|
/**/
|
@ -1,12 +0,0 @@
|
|||||||
diff -up boost_1_37_0/configure.smp boost_1_37_0/configure
|
|
||||||
--- boost_1_37_0/configure.smp 2009-02-05 18:49:01.000000000 +0100
|
|
||||||
+++ boost_1_37_0/configure 2009-02-05 18:53:55.000000000 +0100
|
|
||||||
@@ -347,7 +347,7 @@ LIBS=$LIBS
|
|
||||||
|
|
||||||
all: .dummy
|
|
||||||
@echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage"
|
|
||||||
- @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage || \\
|
|
||||||
+ @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) !!!SMP_FLAGS!!! stage || \\
|
|
||||||
echo "Not all Boost libraries built properly."
|
|
||||||
|
|
||||||
clean: .dummy
|
|
@ -1,15 +0,0 @@
|
|||||||
--- boost_1_37_0/boost/dynamic_bitset/dynamic_bitset.hpp.debug 2008-10-22 03:13:59.000000000 +0900
|
|
||||||
+++ boost_1_37_0/boost/dynamic_bitset/dynamic_bitset.hpp 2009-03-23 03:36:40.000000000 +0900
|
|
||||||
@@ -1017,8 +1017,11 @@
|
|
||||||
? access_by_bytes
|
|
||||||
: access_by_blocks;
|
|
||||||
|
|
||||||
+ if (mode)
|
|
||||||
+ return do_count(m_bits.begin(), num_blocks(), Block(0),
|
|
||||||
+ static_cast<value_to_type<true> *>(0));
|
|
||||||
return do_count(m_bits.begin(), num_blocks(), Block(0),
|
|
||||||
- static_cast<value_to_type<mode> *>(0));
|
|
||||||
+ static_cast<value_to_type<false> *>(0));
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
19
boost-cmake-soname.patch
Normal file
19
boost-cmake-soname.patch
Normal file
@ -0,0 +1,19 @@
|
|||||||
|
*** tools/build/CMake/BoostCore.cmake.orig 2010-01-12 20:01:46.006547352 -0800
|
||||||
|
--- tools/build/CMake/BoostCore.cmake 2010-01-12 20:02:54.222546929 -0800
|
||||||
|
*************** macro(boost_library_variant LIBNAME)
|
||||||
|
*** 755,761 ****
|
||||||
|
if (BUILD_SOVERSIONED)
|
||||||
|
set_target_properties(${VARIANT_LIBNAME}
|
||||||
|
PROPERTIES
|
||||||
|
! SOVERSION "${BOOST_VERSION}"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif ()
|
||||||
|
--- 755,761 ----
|
||||||
|
if (BUILD_SOVERSIONED)
|
||||||
|
set_target_properties(${VARIANT_LIBNAME}
|
||||||
|
PROPERTIES
|
||||||
|
! SOVERSION "_FEDORA_SONAME"
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
endif ()
|
@ -1,38 +0,0 @@
|
|||||||
*** configure.orig 2007-01-16 01:39:00.000000000 +0100
|
|
||||||
--- configure 2007-01-19 03:53:08.000000000 +0100
|
|
||||||
***************
|
|
||||||
*** 9,15 ****
|
|
||||||
|
|
||||||
BJAM=""
|
|
||||||
TOOLSET=""
|
|
||||||
! BJAM_CONFIG=""
|
|
||||||
BUILD=""
|
|
||||||
PREFIX=/usr/local
|
|
||||||
EPREFIX=
|
|
||||||
--- 9,15 ----
|
|
||||||
|
|
||||||
BJAM=""
|
|
||||||
TOOLSET=""
|
|
||||||
! BJAM_CONFIG="-d2 --layout=system variant=release threading=single,multi debug-symbols=on"
|
|
||||||
BUILD=""
|
|
||||||
PREFIX=/usr/local
|
|
||||||
EPREFIX=
|
|
||||||
*************** INCLUDEDIR=$INCLUDEDIR
|
|
||||||
*** 325,332 ****
|
|
||||||
LIBS=$LIBS
|
|
||||||
|
|
||||||
all: .dummy
|
|
||||||
! @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS)"
|
|
||||||
! @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) || \\
|
|
||||||
echo "Not all Boost libraries built properly."
|
|
||||||
|
|
||||||
clean: .dummy
|
|
||||||
--- 325,332 ----
|
|
||||||
LIBS=$LIBS
|
|
||||||
|
|
||||||
all: .dummy
|
|
||||||
! @echo "\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage"
|
|
||||||
! @\$(BJAM) \$(BJAM_CONFIG) --user-config=user-config.jam \$(LIBS) stage || \\
|
|
||||||
echo "Not all Boost libraries built properly."
|
|
||||||
|
|
||||||
clean: .dummy
|
|
@ -1,16 +0,0 @@
|
|||||||
Index: boost/filesystem/operations.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/filesystem/operations.hpp (revision 52859)
|
|
||||||
+++ boost/filesystem/operations.hpp (working copy)
|
|
||||||
@@ -659,9 +659,9 @@
|
|
||||||
{ return is_symlink<wpath>( ph ); }
|
|
||||||
|
|
||||||
inline bool is_empty( const path & ph )
|
|
||||||
- { return is_empty<path>( ph ); }
|
|
||||||
+ { return boost::filesystem::is_empty<path>( ph ); }
|
|
||||||
inline bool is_empty( const wpath & ph )
|
|
||||||
- { return is_empty<wpath>( ph ); }
|
|
||||||
+ { return boost::filesystem::is_empty<wpath>( ph ); }
|
|
||||||
|
|
||||||
inline bool equivalent( const path & ph1, const path & ph2 )
|
|
||||||
{ return equivalent<path>( ph1, ph2 ); }
|
|
@ -1,14 +0,0 @@
|
|||||||
--- boost/function/function_template.hpp.orig 2008-12-19 10:32:27.000000000 +0000
|
|
||||||
+++ boost/function/function_template.hpp 2008-12-19 10:33:27.000000000 +0000
|
|
||||||
@@ -950,10 +950,10 @@
|
|
||||||
f.vtable->manager(f.functor, this->functor,
|
|
||||||
boost::detail::function::move_functor_tag);
|
|
||||||
f.vtable = 0;
|
|
||||||
-#if !defined(BOOST_NO_EXCEPTIONS)
|
|
||||||
} else {
|
|
||||||
clear();
|
|
||||||
}
|
|
||||||
+#if !defined(BOOST_NO_EXCEPTIONS)
|
|
||||||
} catch (...) {
|
|
||||||
vtable = 0;
|
|
||||||
throw;
|
|
@ -1,21 +0,0 @@
|
|||||||
--- boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam.orig 2008-08-11 13:15:13.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/tools/build/v2/tools/gcc.jam 2008-08-11 15:21:05.000000000 +0200
|
|
||||||
@@ -336,7 +336,8 @@
|
|
||||||
# OSF does have an option called -soname but it does not seem to work as
|
|
||||||
# expected, therefore it has been disabled.
|
|
||||||
HAVE_SONAME = "" ;
|
|
||||||
- SONAME_OPTION = -h ;
|
|
||||||
+ SONAME_OPTION = -soname ;
|
|
||||||
+ SONAME_VERSION = !!!SONAME!!! ;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@@ -726,7 +727,7 @@
|
|
||||||
# Differs from 'link' above only by -shared.
|
|
||||||
actions link.dll bind LIBRARIES
|
|
||||||
{
|
|
||||||
- "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
|
||||||
+ "$(CONFIG_COMMAND)" -L"$(LINKPATH)" -Wl,$(RPATH_OPTION:E=-R)$(SPACE)-Wl,"$(RPATH)" "$(.IMPLIB-COMMAND)$(<[1])" -o "$(<[-1])" $(HAVE_SONAME)-Wl,$(SONAME_OPTION)$(SPACE)-Wl,$(<[-1]:D=).$(SONAME_VERSION) -shared $(START-GROUP) "$(>)" "$(LIBRARIES)" $(FINDLIBS-ST-PFX) -l$(FINDLIBS-ST) $(FINDLIBS-SA-PFX) -l$(FINDLIBS-SA) $(END-GROUP) $(OPTIONS) $(USER_OPTIONS)
|
|
||||||
}
|
|
||||||
|
|
||||||
rule setup-threading ( targets * : sources * : properties * )
|
|
@ -1,157 +0,0 @@
|
|||||||
diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/archive/polymorphic_iarchive.hpp 2008-08-11 23:49:44.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/archive/polymorphic_iarchive.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -35,6 +35,8 @@ namespace std{
|
|
||||||
#include <boost/serialization/nvp.hpp>
|
|
||||||
#include <boost/archive/detail/register_archive.hpp>
|
|
||||||
|
|
||||||
+#include <limits.h>
|
|
||||||
+
|
|
||||||
// determine if its necessary to handle (u)int64_t specifically
|
|
||||||
// i.e. that its not a synonym for (unsigned) long
|
|
||||||
// if there is no 64 bit int or if its the same as a long
|
|
||||||
Only in boost_1_36_0_beta1/boost/archive: polymorphic_iarchive.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/archive/polymorphic_oarchive.hpp 2008-08-11 23:49:44.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/archive/polymorphic_oarchive.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -34,6 +34,8 @@ namespace std{
|
|
||||||
#include <boost/serialization/nvp.hpp>
|
|
||||||
#include <boost/archive/detail/register_archive.hpp>
|
|
||||||
|
|
||||||
+#include <limits.h>
|
|
||||||
+
|
|
||||||
// determine if its necessary to handle (u)int64_t specifically
|
|
||||||
// i.e. that its not a synonym for (unsigned) long
|
|
||||||
// if there is no 64 bit int or if its the same as a long
|
|
||||||
Only in boost_1_36_0_beta1/boost/archive: polymorphic_oarchive.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/date_time/tz_db_base.hpp 2008-08-11 23:49:45.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/date_time/tz_db_base.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -158,7 +158,7 @@ namespace boost {
|
|
||||||
typedef typename time_zone_type::base_type time_zone_base_type;
|
|
||||||
typedef typename time_zone_type::time_duration_type time_duration_type;
|
|
||||||
typedef time_zone_names_base<char_type> time_zone_names;
|
|
||||||
- typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets;
|
|
||||||
+ typedef dst_adjustment_offsets<time_duration_type> dst_adjustment_offsets_t;
|
|
||||||
typedef std::basic_string<char_type> string_type;
|
|
||||||
|
|
||||||
//! Constructs an empty database
|
|
||||||
@@ -346,18 +346,18 @@ namespace boost {
|
|
||||||
time_duration_type utc_offset =
|
|
||||||
str_from_delimited_time_duration<time_duration_type,char_type>(result[GMTOFFSET]);
|
|
||||||
|
|
||||||
- dst_adjustment_offsets adjust(time_duration_type(0,0,0),
|
|
||||||
- time_duration_type(0,0,0),
|
|
||||||
- time_duration_type(0,0,0));
|
|
||||||
+ dst_adjustment_offsets_t adjust(time_duration_type(0,0,0),
|
|
||||||
+ time_duration_type(0,0,0),
|
|
||||||
+ time_duration_type(0,0,0));
|
|
||||||
|
|
||||||
boost::shared_ptr<rule_type> rules;
|
|
||||||
|
|
||||||
if(has_dst){
|
|
||||||
- adjust = dst_adjustment_offsets(
|
|
||||||
- str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
|
|
||||||
- str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
|
|
||||||
- str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
|
|
||||||
- );
|
|
||||||
+ adjust = dst_adjustment_offsets_t(
|
|
||||||
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[DSTADJUST]),
|
|
||||||
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[START_TIME]),
|
|
||||||
+ str_from_delimited_time_duration<time_duration_type,char_type>(result[END_TIME])
|
|
||||||
+ );
|
|
||||||
|
|
||||||
rules =
|
|
||||||
boost::shared_ptr<rule_type>(parse_rules(result[START_DATE_RULE],
|
|
||||||
Only in boost_1_36_0_beta1/boost/date_time: tz_db_base.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_creator.hpp 2008-08-11 23:49:48.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_creator.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -36,6 +36,8 @@
|
|
||||||
# pragma warning(disable: 4800)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <limits.h>
|
|
||||||
+
|
|
||||||
namespace boost{
|
|
||||||
|
|
||||||
namespace re_detail{
|
|
||||||
Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_creator.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex.hpp 2008-08-11 23:49:48.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/regex/v4/basic_regex.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -30,6 +30,8 @@
|
|
||||||
#pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <limits.h>
|
|
||||||
+
|
|
||||||
namespace boost{
|
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
#pragma warning(push)
|
|
||||||
Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/regex/v4/basic_regex_parser.hpp 2008-08-11 23:49:48.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/regex/v4/basic_regex_parser.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -30,6 +30,8 @@
|
|
||||||
#pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <limits.h>
|
|
||||||
+
|
|
||||||
namespace boost{
|
|
||||||
namespace re_detail{
|
|
||||||
|
|
||||||
Only in boost_1_36_0_beta1/boost/regex/v4: basic_regex_parser.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:49:48.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/regex/v4/perl_matcher.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -30,6 +30,8 @@
|
|
||||||
# pragma warning(disable: 4800)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <limits.h>
|
|
||||||
+
|
|
||||||
namespace boost{
|
|
||||||
namespace re_detail{
|
|
||||||
|
|
||||||
Only in boost_1_36_0_beta1/boost/regex/v4: perl_matcher.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/regex/v4/regex_split.hpp 2008-08-11 23:49:48.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/regex/v4/regex_split.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -21,6 +21,8 @@
|
|
||||||
#ifndef BOOST_REGEX_SPLIT_HPP
|
|
||||||
#define BOOST_REGEX_SPLIT_HPP
|
|
||||||
|
|
||||||
+#include <limits.h>
|
|
||||||
+
|
|
||||||
namespace boost{
|
|
||||||
|
|
||||||
#ifdef BOOST_MSVC
|
|
||||||
Only in boost_1_36_0_beta1/boost/regex/v4: regex_split.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp boost_1_36_0_beta1/boost/regex/v4/states.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/regex/v4/states.hpp 2008-08-11 23:49:48.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/regex/v4/states.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -30,6 +30,8 @@
|
|
||||||
#pragma warning(pop)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
+#include <limits.h>
|
|
||||||
+
|
|
||||||
namespace boost{
|
|
||||||
namespace re_detail{
|
|
||||||
|
|
||||||
Only in boost_1_36_0_beta1/boost/regex/v4: states.hpp.orig
|
|
||||||
diff -urp boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp
|
|
||||||
--- boost_1_36_0_beta1-orig/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-08-11 23:49:45.000000000 +0200
|
|
||||||
+++ boost_1_36_0_beta1/boost/wave/cpplexer/re2clex/cpp_re2c_lexer.hpp 2008-08-11 23:50:38.000000000 +0200
|
|
||||||
@@ -16,6 +16,8 @@
|
|
||||||
#include <string>
|
|
||||||
#include <cstdio>
|
|
||||||
#include <cstdarg>
|
|
||||||
+#include <cstring>
|
|
||||||
+
|
|
||||||
#if defined(BOOST_SPIRIT_DEBUG)
|
|
||||||
#include <iostream>
|
|
||||||
#endif // defined(BOOST_SPIRIT_DEBUG)
|
|
||||||
Only in boost_1_36_0_beta1/boost/wave/cpplexer/re2clex: cpp_re2c_lexer.hpp.orig
|
|
@ -1,159 +0,0 @@
|
|||||||
Index: /trunk/boost/gil/color_base.hpp
|
|
||||||
===================================================================
|
|
||||||
--- /trunk/boost/gil/color_base.hpp (revision 54725)
|
|
||||||
+++ /trunk/boost/gil/color_base.hpp (revision 58777)
|
|
||||||
@@ -86,5 +86,5 @@
|
|
||||||
operator Element () const { return _v0; }
|
|
||||||
|
|
||||||
- template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,1>& c) : _v0(at_c<0>(c)) {}
|
|
||||||
+ template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,1>& c) : _v0(gil::at_c<0>(c)) {}
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -108,11 +108,11 @@
|
|
||||||
|
|
||||||
template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,2>& c) :
|
|
||||||
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)) {}
|
|
||||||
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)) {}
|
|
||||||
|
|
||||||
// Support for l-value reference proxy copy construction
|
|
||||||
template <typename E2, typename L2> homogeneous_color_base( homogeneous_color_base<E2,L2,2>& c) :
|
|
||||||
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)) {}
|
|
||||||
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)) {}
|
|
||||||
|
|
||||||
// Support for planar_pixel_iterator construction and dereferencing
|
|
||||||
@@ -213,15 +213,15 @@
|
|
||||||
|
|
||||||
template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,4>& c) :
|
|
||||||
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)),
|
|
||||||
- _v3(at_c<mapping_transform<Layout,L2,3>::value>(c)) {}
|
|
||||||
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)),
|
|
||||||
+ _v3(gil::at_c<mapping_transform<Layout,L2,3>::value>(c)) {}
|
|
||||||
|
|
||||||
// Support for l-value reference proxy copy construction
|
|
||||||
template <typename E2, typename L2> homogeneous_color_base( homogeneous_color_base<E2,L2,4>& c) :
|
|
||||||
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)),
|
|
||||||
- _v3(at_c<mapping_transform<Layout,L2,3>::value>(c)) {}
|
|
||||||
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)),
|
|
||||||
+ _v3(gil::at_c<mapping_transform<Layout,L2,3>::value>(c)) {}
|
|
||||||
|
|
||||||
// Support for planar_pixel_iterator construction and dereferencing
|
|
||||||
@@ -279,17 +279,17 @@
|
|
||||||
|
|
||||||
template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,5>& c) :
|
|
||||||
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)),
|
|
||||||
- _v3(at_c<mapping_transform<Layout,L2,3>::value>(c)),
|
|
||||||
- _v4(at_c<mapping_transform<Layout,L2,4>::value>(c)) {}
|
|
||||||
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)),
|
|
||||||
+ _v3(gil::at_c<mapping_transform<Layout,L2,3>::value>(c)),
|
|
||||||
+ _v4(gil::at_c<mapping_transform<Layout,L2,4>::value>(c)) {}
|
|
||||||
|
|
||||||
// Support for l-value reference proxy copy construction
|
|
||||||
template <typename E2, typename L2> homogeneous_color_base( homogeneous_color_base<E2,L2,5>& c) :
|
|
||||||
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)),
|
|
||||||
- _v3(at_c<mapping_transform<Layout,L2,3>::value>(c)),
|
|
||||||
- _v4(at_c<mapping_transform<Layout,L2,4>::value>(c)) {}
|
|
||||||
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)),
|
|
||||||
+ _v3(gil::at_c<mapping_transform<Layout,L2,3>::value>(c)),
|
|
||||||
+ _v4(gil::at_c<mapping_transform<Layout,L2,4>::value>(c)) {}
|
|
||||||
|
|
||||||
// Support for planar_pixel_iterator construction and dereferencing
|
|
||||||
Index: /trunk/boost/gil/bit_aligned_pixel_reference.hpp
|
|
||||||
===================================================================
|
|
||||||
--- /trunk/boost/gil/bit_aligned_pixel_reference.hpp (revision 54725)
|
|
||||||
+++ /trunk/boost/gil/bit_aligned_pixel_reference.hpp (revision 58777)
|
|
||||||
@@ -170,6 +170,6 @@
|
|
||||||
private:
|
|
||||||
static void check_gray() { BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
|
|
||||||
- template <typename Channel> void assign(const Channel& chan, mpl::false_) const { check_gray(); at_c<0>(*this)=chan; }
|
|
||||||
- template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
|
|
||||||
+ template <typename Channel> void assign(const Channel& chan, mpl::false_) const { check_gray(); gil::at_c<0>(*this)=chan; }
|
|
||||||
+ template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
|
|
||||||
};
|
|
||||||
|
|
||||||
Index: /trunk/boost/gil/extension/dynamic_image/reduce.hpp
|
|
||||||
===================================================================
|
|
||||||
--- /trunk/boost/gil/extension/dynamic_image/reduce.hpp (revision 37609)
|
|
||||||
+++ /trunk/boost/gil/extension/dynamic_image/reduce.hpp (revision 58777)
|
|
||||||
@@ -60,5 +60,5 @@
|
|
||||||
template <typename SrcTypes, typename DstTypes, long K>
|
|
||||||
struct at_c<mapping_vector<SrcTypes,DstTypes>, K> {
|
|
||||||
- static const std::size_t value=size<DstTypes>::value - order<DstTypes, typename at_c<SrcTypes,K>::type>::type::value +1;
|
|
||||||
+ static const std::size_t value=size<DstTypes>::value - order<DstTypes, typename gil::at_c<SrcTypes,K>::type>::type::value +1;
|
|
||||||
typedef size_t<value> type;
|
|
||||||
};
|
|
||||||
Index: /trunk/boost/gil/gil_concept.hpp
|
|
||||||
===================================================================
|
|
||||||
--- /trunk/boost/gil/gil_concept.hpp (revision 57980)
|
|
||||||
+++ /trunk/boost/gil/gil_concept.hpp (revision 58777)
|
|
||||||
@@ -619,5 +619,5 @@
|
|
||||||
|
|
||||||
#if !defined(_MSC_VER) || _MSC_VER > 1310
|
|
||||||
- CR cr=at_c<num_elements-1>(cb); ignore_unused_variable_warning(cr);
|
|
||||||
+ CR cr=gil::at_c<num_elements-1>(cb); ignore_unused_variable_warning(cr);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
@@ -656,6 +656,6 @@
|
|
||||||
|
|
||||||
#if !defined(_MSC_VER) || _MSC_VER > 1310
|
|
||||||
- CR r=at_c<0>(cb);
|
|
||||||
- at_c<0>(cb)=r;
|
|
||||||
+ CR r=gil::at_c<0>(cb);
|
|
||||||
+ gil::at_c<0>(cb)=r;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
Index: /trunk/boost/gil/planar_pixel_iterator.hpp
|
|
||||||
===================================================================
|
|
||||||
--- /trunk/boost/gil/planar_pixel_iterator.hpp (revision 54725)
|
|
||||||
+++ /trunk/boost/gil/planar_pixel_iterator.hpp (revision 58777)
|
|
||||||
@@ -185,5 +185,5 @@
|
|
||||||
template <typename IC, typename C>
|
|
||||||
inline std::ptrdiff_t memunit_distance(const planar_pixel_iterator<IC,C>& p1, const planar_pixel_iterator<IC,C>& p2) {
|
|
||||||
- return memunit_distance(at_c<0>(p1),at_c<0>(p2));
|
|
||||||
+ return memunit_distance(gil::at_c<0>(p1),gil::at_c<0>(p2));
|
|
||||||
}
|
|
||||||
|
|
||||||
Index: /trunk/boost/gil/packed_pixel.hpp
|
|
||||||
===================================================================
|
|
||||||
--- /trunk/boost/gil/packed_pixel.hpp (revision 58302)
|
|
||||||
+++ /trunk/boost/gil/packed_pixel.hpp (revision 58777)
|
|
||||||
@@ -78,5 +78,5 @@
|
|
||||||
packed_pixel(int chan0, int chan1) : _bitfield(0) {
|
|
||||||
BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==2));
|
|
||||||
- at_c<0>(*this)=chan0; at_c<1>(*this)=chan1;
|
|
||||||
+ gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1;
|
|
||||||
}
|
|
||||||
packed_pixel(int chan0, int chan1, int chan2) : _bitfield(0) {
|
|
||||||
@@ -107,9 +107,9 @@
|
|
||||||
// Support for assignment/equality comparison of a channel with a grayscale pixel
|
|
||||||
static void check_gray() { BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
|
|
||||||
- template <typename Channel> void assign(const Channel& chan, mpl::false_) { check_gray(); at_c<0>(*this)=chan; }
|
|
||||||
- template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
|
|
||||||
+ template <typename Channel> void assign(const Channel& chan, mpl::false_) { check_gray(); gil::at_c<0>(*this)=chan; }
|
|
||||||
+ template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
|
|
||||||
public:
|
|
||||||
- packed_pixel& operator= (int chan) { check_gray(); at_c<0>(*this)=chan; return *this; }
|
|
||||||
- bool operator==(int chan) const { check_gray(); return at_c<0>(*this)==chan; }
|
|
||||||
+ packed_pixel& operator= (int chan) { check_gray(); gil::at_c<0>(*this)=chan; return *this; }
|
|
||||||
+ bool operator==(int chan) const { check_gray(); return gil::at_c<0>(*this)==chan; }
|
|
||||||
};
|
|
||||||
|
|
@ -1,204 +0,0 @@
|
|||||||
Index: boost/gil/bit_aligned_pixel_reference.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/gil/bit_aligned_pixel_reference.hpp (revision 53049)
|
|
||||||
+++ boost/gil/bit_aligned_pixel_reference.hpp (working copy)
|
|
||||||
@@ -145,7 +145,7 @@
|
|
||||||
|
|
||||||
// Construct from another compatible pixel type
|
|
||||||
bit_aligned_pixel_reference(const bit_aligned_pixel_reference& p) : _bit_range(p._bit_range) {}
|
|
||||||
- template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&at_c<0>(p)), at_c<0>(p).first_bit()) {
|
|
||||||
+ template <typename BF, typename CR> bit_aligned_pixel_reference(packed_pixel<BF,CR,Layout>& p) : _bit_range(static_cast<data_ptr_t>(&gil::at_c<0>(p)), gil::at_c<0>(p).first_bit()) {
|
|
||||||
check_compatible<packed_pixel<BF,CR,Layout> >();
|
|
||||||
}
|
|
||||||
|
|
||||||
Index: boost/gil/color_base.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/gil/color_base.hpp (revision 53049)
|
|
||||||
+++ boost/gil/color_base.hpp (working copy)
|
|
||||||
@@ -155,15 +155,15 @@
|
|
||||||
homogeneous_color_base(Element v0, Element v1, Element v2) : _v0(v0), _v1(v1), _v2(v2) {}
|
|
||||||
|
|
||||||
template <typename E2, typename L2> homogeneous_color_base(const homogeneous_color_base<E2,L2,3>& c) :
|
|
||||||
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
|
|
||||||
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
|
|
||||||
|
|
||||||
// Support for l-value reference proxy copy construction
|
|
||||||
template <typename E2, typename L2> homogeneous_color_base( homogeneous_color_base<E2,L2,3>& c) :
|
|
||||||
- _v0(at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
- _v1(at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
- _v2(at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
|
|
||||||
+ _v0(gil::at_c<mapping_transform<Layout,L2,0>::value>(c)),
|
|
||||||
+ _v1(gil::at_c<mapping_transform<Layout,L2,1>::value>(c)),
|
|
||||||
+ _v2(gil::at_c<mapping_transform<Layout,L2,2>::value>(c)) {}
|
|
||||||
|
|
||||||
// Support for planar_pixel_iterator construction and dereferencing
|
|
||||||
template <typename P> homogeneous_color_base(P* p,bool) :
|
|
||||||
Index: boost/gil/color_base_algorithm.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/gil/color_base_algorithm.hpp (revision 53049)
|
|
||||||
+++ boost/gil/color_base_algorithm.hpp (working copy)
|
|
||||||
@@ -101,7 +101,7 @@
|
|
||||||
template <typename ColorBase, int K> struct kth_semantic_element_reference_type {
|
|
||||||
BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
|
|
||||||
typedef typename kth_element_reference_type<ColorBase,semantic_index>::type type;
|
|
||||||
- static type get(ColorBase& cb) { return at_c<semantic_index>(cb); }
|
|
||||||
+ static type get(ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
|
|
||||||
};
|
|
||||||
|
|
||||||
/// \brief Specifies the return type of the constant semantic_at_c<K>(color_base);
|
|
||||||
@@ -109,7 +109,7 @@
|
|
||||||
template <typename ColorBase, int K> struct kth_semantic_element_const_reference_type {
|
|
||||||
BOOST_STATIC_CONSTANT(int, semantic_index = (mpl::at_c<typename ColorBase::layout_t::channel_mapping_t,K>::type::value));
|
|
||||||
typedef typename kth_element_const_reference_type<ColorBase,semantic_index>::type type;
|
|
||||||
- static type get(const ColorBase& cb) { return at_c<semantic_index>(cb); }
|
|
||||||
+ static type get(const ColorBase& cb) { return gil::at_c<semantic_index>(cb); }
|
|
||||||
};
|
|
||||||
|
|
||||||
/// \brief A mutable accessor to the K-th semantic element of a color base
|
|
||||||
Index: boost/gil/image_view_factory.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/gil/image_view_factory.hpp (revision 53049)
|
|
||||||
+++ boost/gil/image_view_factory.hpp (working copy)
|
|
||||||
@@ -102,7 +102,7 @@
|
|
||||||
BOOST_STATIC_ASSERT((!is_planar<HomogeneousView>::value && view_is_basic<HomogeneousView>::value));
|
|
||||||
BOOST_STATIC_ASSERT((boost::is_pointer<typename HomogeneousView::x_iterator>::value));
|
|
||||||
|
|
||||||
- return &at_c<0>(view(0,0));
|
|
||||||
+ return &gil::at_c<0>(view(0,0));
|
|
||||||
}
|
|
||||||
|
|
||||||
/// \ingroup ImageViewConstructors
|
|
||||||
@@ -430,7 +430,7 @@
|
|
||||||
typedef typename type::xy_locator locator_t;
|
|
||||||
typedef typename type::x_iterator x_iterator_t;
|
|
||||||
typedef typename iterator_adaptor_get_base<x_iterator_t>::type x_iterator_base_t;
|
|
||||||
- x_iterator_t sit(x_iterator_base_t(&at_c<K>(src(0,0))),src.pixels().pixel_size());
|
|
||||||
+ x_iterator_t sit(x_iterator_base_t(&gil::at_c<K>(src(0,0))),src.pixels().pixel_size());
|
|
||||||
return type(src.dimensions(),locator_t(sit, src.pixels().row_size()));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
@@ -444,7 +444,7 @@
|
|
||||||
typedef typename view_type<channel_t, gray_layout_t, false, false, view_is_mutable<View>::value>::type type;
|
|
||||||
static type make(const View& src) {
|
|
||||||
typedef typename type::x_iterator x_iterator_t;
|
|
||||||
- return interleaved_view(src.width(),src.height(),(x_iterator_t)&at_c<K>(src(0,0)), src.pixels().row_size());
|
|
||||||
+ return interleaved_view(src.width(),src.height(),(x_iterator_t)&gil::at_c<K>(src(0,0)), src.pixels().row_size());
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
@@ -494,7 +494,7 @@
|
|
||||||
template <typename P> kth_channel_deref_fn(const kth_channel_deref_fn<K,P>&) {}
|
|
||||||
|
|
||||||
result_type operator()(argument_type srcP) const {
|
|
||||||
- return result_type(at_c<K>(srcP));
|
|
||||||
+ return result_type(gil::at_c<K>(srcP));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
Index: boost/gil/packed_pixel.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/gil/packed_pixel.hpp (revision 53049)
|
|
||||||
+++ boost/gil/packed_pixel.hpp (working copy)
|
|
||||||
@@ -81,7 +81,7 @@
|
|
||||||
}
|
|
||||||
packed_pixel(int chan0, int chan1, int chan2) : _bitfield(0) {
|
|
||||||
BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==3));
|
|
||||||
- at_c<0>(*this)=chan0; at_c<1>(*this)=chan1; at_c<2>(*this)=chan2;
|
|
||||||
+ gil::at_c<0>(*this)=chan0; gil::at_c<1>(*this)=chan1; gil::at_c<2>(*this)=chan2;
|
|
||||||
}
|
|
||||||
packed_pixel(int chan0, int chan1, int chan2, int chan3) : _bitfield(0) {
|
|
||||||
BOOST_STATIC_ASSERT((num_channels<packed_pixel>::value==4));
|
|
||||||
Index: boost/gil/pixel.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/gil/pixel.hpp (revision 53049)
|
|
||||||
+++ boost/gil/pixel.hpp (working copy)
|
|
||||||
@@ -143,11 +143,11 @@
|
|
||||||
|
|
||||||
private:
|
|
||||||
static void check_gray() { BOOST_STATIC_ASSERT((is_same<typename Layout::color_space_t, gray_t>::value)); }
|
|
||||||
- template <typename Channel> void assign(const Channel& chan, mpl::false_) { check_gray(); at_c<0>(*this)=chan; }
|
|
||||||
- template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return at_c<0>(*this)==chan; }
|
|
||||||
+ template <typename Channel> void assign(const Channel& chan, mpl::false_) { check_gray(); gil::at_c<0>(*this)=chan; }
|
|
||||||
+ template <typename Channel> bool equal (const Channel& chan, mpl::false_) const { check_gray(); return gil::at_c<0>(*this)==chan; }
|
|
||||||
public:
|
|
||||||
- pixel& operator= (channel_t chan) { check_gray(); at_c<0>(*this)=chan; return *this; }
|
|
||||||
- bool operator==(channel_t chan) const { check_gray(); return at_c<0>(*this)==chan; }
|
|
||||||
+ pixel& operator= (channel_t chan) { check_gray(); gil::at_c<0>(*this)=chan; return *this; }
|
|
||||||
+ bool operator==(channel_t chan) const { check_gray(); return gil::at_c<0>(*this)==chan; }
|
|
||||||
};
|
|
||||||
|
|
||||||
/////////////////////////////
|
|
||||||
Index: boost/gil/planar_pixel_iterator.hpp
|
|
||||||
===================================================================
|
|
||||||
--- boost/gil/planar_pixel_iterator.hpp (revision 53049)
|
|
||||||
+++ boost/gil/planar_pixel_iterator.hpp (working copy)
|
|
||||||
@@ -109,8 +109,8 @@
|
|
||||||
reference operator->() const { return **this; }
|
|
||||||
|
|
||||||
// PERFORMANCE_CHECK: Remove?
|
|
||||||
- bool operator< (const planar_pixel_iterator& ptr) const { return at_c<0>(*this)< at_c<0>(ptr); }
|
|
||||||
- bool operator!=(const planar_pixel_iterator& ptr) const { return at_c<0>(*this)!=at_c<0>(ptr); }
|
|
||||||
+ bool operator< (const planar_pixel_iterator& ptr) const { return gil::at_c<0>(*this)< gil::at_c<0>(ptr); }
|
|
||||||
+ bool operator!=(const planar_pixel_iterator& ptr) const { return gil::at_c<0>(*this)!=gil::at_c<0>(ptr); }
|
|
||||||
private:
|
|
||||||
friend class boost::iterator_core_access;
|
|
||||||
|
|
||||||
@@ -119,8 +119,8 @@
|
|
||||||
void advance(ptrdiff_t d) { static_transform(*this,*this,std::bind2nd(detail::plus_asymmetric<ChannelPtr,ptrdiff_t>(),d)); }
|
|
||||||
reference dereference() const { return this->template deref<reference>(); }
|
|
||||||
|
|
||||||
- ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return at_c<0>(it)-at_c<0>(*this); }
|
|
||||||
- bool equal(const planar_pixel_iterator& it) const { return at_c<0>(*this)==at_c<0>(it); }
|
|
||||||
+ ptrdiff_t distance_to(const planar_pixel_iterator& it) const { return gil::at_c<0>(it)-gil::at_c<0>(*this); }
|
|
||||||
+ bool equal(const planar_pixel_iterator& it) const { return gil::at_c<0>(*this)==gil::at_c<0>(it); }
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace detail {
|
|
||||||
Index: libs/gil/test/pixel.cpp
|
|
||||||
===================================================================
|
|
||||||
--- libs/gil/test/pixel.cpp (revision 53049)
|
|
||||||
+++ libs/gil/test/pixel.cpp (working copy)
|
|
||||||
@@ -34,8 +34,9 @@
|
|
||||||
// Testing pixel references and values, pixel operations, color conversion
|
|
||||||
|
|
||||||
using namespace boost::gil;
|
|
||||||
-using namespace std;
|
|
||||||
+using std::swap;
|
|
||||||
using namespace boost;
|
|
||||||
+
|
|
||||||
void error_if(bool condition);
|
|
||||||
|
|
||||||
struct increment {
|
|
||||||
@@ -63,8 +64,8 @@
|
|
||||||
|
|
||||||
// test homogeneous algorithms - fill, max, min
|
|
||||||
static const int num_chan = num_channels<typename C2::pixel_t>::value;
|
|
||||||
- static_fill(C2::_pixel, at_c<0>(C1::_pixel)+1);
|
|
||||||
- error_if(at_c<0>(C2::_pixel) != at_c<num_chan-1>(C2::_pixel));
|
|
||||||
+ static_fill(C2::_pixel, gil::at_c<0>(C1::_pixel)+1);
|
|
||||||
+ error_if(gil::at_c<0>(C2::_pixel) != gil::at_c<num_chan-1>(C2::_pixel));
|
|
||||||
|
|
||||||
C2::_pixel = C1::_pixel;
|
|
||||||
error_if(static_max(C2::_pixel) != static_max(C1::_pixel));
|
|
||||||
@@ -107,7 +108,7 @@
|
|
||||||
error_if(C1::_pixel!=C2::_pixel);
|
|
||||||
|
|
||||||
static_generate(C2::_pixel, set_to_one());
|
|
||||||
- error_if(at_c<0>(C2::_pixel) != 1);
|
|
||||||
+ error_if(gil::at_c<0>(C2::_pixel) != 1);
|
|
||||||
|
|
||||||
// Test swap if both are mutable and if their value type is the same
|
|
||||||
// (We know the second one is mutable)
|
|
||||||
@@ -313,7 +314,7 @@
|
|
||||||
bgr8_pixel_t bgr8(rgb8);
|
|
||||||
error_if(bgr8[0] == rgb8[0]);
|
|
||||||
error_if(dynamic_at_c(bgr8,0) == dynamic_at_c(rgb8,0));
|
|
||||||
- error_if(at_c<0>(bgr8) == at_c<0>(rgb8));
|
|
||||||
+ error_if(gil::at_c<0>(bgr8) == gil::at_c<0>(rgb8));
|
|
||||||
error_if(semantic_at_c<0>(bgr8) != semantic_at_c<0>(rgb8));
|
|
||||||
error_if(get_color(bgr8,blue_t()) != get_color(rgb8,blue_t()));
|
|
||||||
|
|
@ -1,168 +0,0 @@
|
|||||||
*** tools/regression/src/run_tests.sh.orig 2007-07-31 19:44:25.000000000 -0500
|
|
||||||
--- tools/regression/src/run_tests.sh 2007-08-01 12:17:25.000000000 -0500
|
|
||||||
***************
|
|
||||||
*** 15,21 ****
|
|
||||||
# This can be either a non-exitent directory or an already complete Boost
|
|
||||||
# source tree.
|
|
||||||
#
|
|
||||||
! boost_root="$HOME/CVSROOTs/Boost/boost_regression"
|
|
||||||
|
|
||||||
#
|
|
||||||
# Wether to fetch the most current Boost code from CVS (yes/no):
|
|
||||||
--- 15,21 ----
|
|
||||||
# This can be either a non-exitent directory or an already complete Boost
|
|
||||||
# source tree.
|
|
||||||
#
|
|
||||||
! boost_root="/usr/src/redhat/BUILD/boost_1_34_1"
|
|
||||||
|
|
||||||
#
|
|
||||||
# Wether to fetch the most current Boost code from CVS (yes/no):
|
|
||||||
*************** test_tools=gcc
|
|
||||||
*** 42,58 ****
|
|
||||||
toolset=gcc
|
|
||||||
|
|
||||||
#
|
|
||||||
- # "comment_path" is the path to an html-file describing the test environment.
|
|
||||||
- # The content of this file will be embedded in the status pages being produced.
|
|
||||||
- #
|
|
||||||
- comment_path="$boost_root/../regression_comment.html"
|
|
||||||
- #
|
|
||||||
# "test_dir" is the relative path to the directory to run the tests in,
|
|
||||||
# defaults to "status" and runs all the tests, but could be a sub-directory
|
|
||||||
# for example "libs/regex/test" to run the regex tests alone.
|
|
||||||
#
|
|
||||||
test_dir="status"
|
|
||||||
|
|
||||||
|
|
||||||
### DEFAULTS ARE OK FOR THESE.
|
|
||||||
|
|
||||||
--- 42,59 ----
|
|
||||||
toolset=gcc
|
|
||||||
|
|
||||||
#
|
|
||||||
# "test_dir" is the relative path to the directory to run the tests in,
|
|
||||||
# defaults to "status" and runs all the tests, but could be a sub-directory
|
|
||||||
# for example "libs/regex/test" to run the regex tests alone.
|
|
||||||
#
|
|
||||||
test_dir="status"
|
|
||||||
|
|
||||||
+ #
|
|
||||||
+ # "comment_path" is the path to an html-file describing the test environment.
|
|
||||||
+ # The content of this file will be embedded in the status pages being produced.
|
|
||||||
+ #
|
|
||||||
+ comment_path="$boost_root/$test_dir/regression_comment.html"
|
|
||||||
+
|
|
||||||
|
|
||||||
### DEFAULTS ARE OK FOR THESE.
|
|
||||||
|
|
||||||
*************** exe_suffix=
|
|
||||||
*** 71,76 ****
|
|
||||||
--- 72,80 ----
|
|
||||||
#
|
|
||||||
bjam="$boost_root/tools/jam/src/bin/bjam$exe_suffix"
|
|
||||||
|
|
||||||
+ # bjam options
|
|
||||||
+ bjam_flags="--layout=system variant=release -sICU_PATH=/usr --user-config=$boost_root/user-config.jam"
|
|
||||||
+
|
|
||||||
#
|
|
||||||
# "process_jam_log", and "compiler_status" paths to built helper programs:
|
|
||||||
# The location of the executables of the regression help programs. These
|
|
||||||
*************** else
|
|
||||||
*** 98,103 ****
|
|
||||||
--- 102,115 ----
|
|
||||||
fi
|
|
||||||
export BOOST_BUILD_PATH
|
|
||||||
|
|
||||||
+ # For shared objects.
|
|
||||||
+ old_ld_library_path=$LD_LIBRARY_PATH
|
|
||||||
+ old_ld_run_path=$LD_RUN_PATH
|
|
||||||
+ LD_LIBRARY_PATH="$boost_root/stage/lib:$old_ld_library_path"
|
|
||||||
+ LD_RUN_PATH="$boost_root/stage/lib:$old_ld_run_path"
|
|
||||||
+ export LD_LIBRARY_PATH
|
|
||||||
+ export LD_RUN_PATH
|
|
||||||
+
|
|
||||||
#
|
|
||||||
# STEP 0:
|
|
||||||
#
|
|
||||||
*************** fi
|
|
||||||
*** 126,137 ****
|
|
||||||
# STEP 1:
|
|
||||||
# rebuild bjam if required:
|
|
||||||
#
|
|
||||||
! echo building bjam:
|
|
||||||
! cd "$boost_root/tools/jam/src" && \
|
|
||||||
! LOCATE_TARGET=bin sh ./build.sh
|
|
||||||
! if test $? != 0 ; then
|
|
||||||
! echo "bjam build failed."
|
|
||||||
! exit 256
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
--- 138,152 ----
|
|
||||||
# STEP 1:
|
|
||||||
# rebuild bjam if required:
|
|
||||||
#
|
|
||||||
! echo "finding or building bjam":
|
|
||||||
! if test ! -f "$bjam" ; then
|
|
||||||
! echo "building bjam":
|
|
||||||
! cd "$boost_root/tools/jam/src" && \
|
|
||||||
! LOCATE_TARGET=bin sh ./build.sh
|
|
||||||
! if test $? != 0 ; then
|
|
||||||
! echo "bjam build failed."
|
|
||||||
! exit 256
|
|
||||||
! fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
#
|
|
||||||
*************** fi
|
|
||||||
*** 139,146 ****
|
|
||||||
# rebuild the regression test helper programs if required:
|
|
||||||
#
|
|
||||||
echo building regression test helper programs:
|
|
||||||
! cd "$boost_root/tools/regression/build" && \
|
|
||||||
! "$bjam" $toolset release
|
|
||||||
if test $? != 0 ; then
|
|
||||||
echo "helper program build failed."
|
|
||||||
exit 256
|
|
||||||
--- 154,160 ----
|
|
||||||
# rebuild the regression test helper programs if required:
|
|
||||||
#
|
|
||||||
echo building regression test helper programs:
|
|
||||||
! cd "$boost_root/tools/regression/build" && "$bjam" $bjam_flags $toolset
|
|
||||||
if test $? != 0 ; then
|
|
||||||
echo "helper program build failed."
|
|
||||||
exit 256
|
|
||||||
*************** for tool in $test_tools ; do
|
|
||||||
*** 158,164 ****
|
|
||||||
#
|
|
||||||
echo running the $tool regression tests:
|
|
||||||
cd "$boost_root/$test_dir"
|
|
||||||
! "$bjam" $tool --dump-tests 2>&1 | tee regress.log
|
|
||||||
|
|
||||||
#
|
|
||||||
# STEP 4:
|
|
||||||
--- 172,180 ----
|
|
||||||
#
|
|
||||||
echo running the $tool regression tests:
|
|
||||||
cd "$boost_root/$test_dir"
|
|
||||||
! echo "<p> begin time: " `date` "</p>" >> "$comment_path"
|
|
||||||
! "$bjam" $bjam_flags $tool --dump-tests 2>&1 | tee regress.log
|
|
||||||
! echo "<p> end time: " `date` "</p>" >> "$comment_path"
|
|
||||||
|
|
||||||
#
|
|
||||||
# STEP 4:
|
|
||||||
*************** if test $? != 0 ; then
|
|
||||||
*** 185,190 ****
|
|
||||||
--- 201,212 ----
|
|
||||||
exit 256
|
|
||||||
fi
|
|
||||||
|
|
||||||
+ # cleanup
|
|
||||||
+ LD_LIBRARY_PATH="$old_ld_library_path"
|
|
||||||
+ LD_RUN_PATH="$old_ld_run_path"
|
|
||||||
+ export LD_LIBRARY_PATH
|
|
||||||
+ export LD_RUN_PATH
|
|
||||||
+
|
|
||||||
echo "done!"
|
|
||||||
|
|
||||||
|
|
@ -1,11 +0,0 @@
|
|||||||
diff -ru boost_1_37_0.orig/boost/spirit/home/classic/iterator/multi_pass.hpp boost_1_37_0/boost/spirit/home/classic/iterator/multi_pass.hpp
|
|
||||||
--- boost/spirit/home/classic/iterator/multi_pass.hpp 2009-01-09 10:38:36.000000000 +0000
|
|
||||||
+++ boost/spirit/home/classic/iterator/multi_pass.hpp 2009-01-09 10:39:41.000000000 +0000
|
|
||||||
@@ -12,7 +12,6 @@
|
|
||||||
#include <boost/throw_exception.hpp>
|
|
||||||
#include <deque>
|
|
||||||
#include <iterator>
|
|
||||||
-#include <iostream>
|
|
||||||
#include <algorithm> // for std::swap
|
|
||||||
#include <exception> // for std::exception
|
|
||||||
#include <boost/limits.hpp>
|
|
@ -1,19 +0,0 @@
|
|||||||
*** tools/build/v2/tools/gcc.jam.orig 2008-11-17 16:26:39.000000000 -0800
|
|
||||||
--- tools/build/v2/tools/gcc.jam 2008-11-17 16:31:08.000000000 -0800
|
|
||||||
*************** toolset.flags gcc.compile PCH_FILE <pch>
|
|
||||||
*** 292,298 ****
|
|
||||||
|
|
||||||
# Declare flags and action for compilation.
|
|
||||||
toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
|
|
||||||
! toolset.flags gcc.compile OPTIONS <optimization>speed : -O3 ;
|
|
||||||
toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
|
||||||
|
|
||||||
toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
|
||||||
--- 292,298 ----
|
|
||||||
|
|
||||||
# Declare flags and action for compilation.
|
|
||||||
toolset.flags gcc.compile OPTIONS <optimization>off : -O0 ;
|
|
||||||
! toolset.flags gcc.compile OPTIONS <optimization>speed : "$RPM_OPT_FLAGS" ;
|
|
||||||
toolset.flags gcc.compile OPTIONS <optimization>space : -Os ;
|
|
||||||
|
|
||||||
toolset.flags gcc.compile OPTIONS <inlining>off : -fno-inline ;
|
|
2520
boost.spec
2520
boost.spec
File diff suppressed because it is too large
Load Diff
21
libboost_thread.so
Normal file
21
libboost_thread.so
Normal file
@ -0,0 +1,21 @@
|
|||||||
|
changequote(`[', `]')dnl
|
||||||
|
/* GNU ld script
|
||||||
|
|
||||||
|
Boost.Thread header files pull in enough of Boost.System that
|
||||||
|
symbols from the latter library are referenced by a compiled object
|
||||||
|
that includes Boost.Thread headers. libboost_system-mt.so is among
|
||||||
|
libboost_thread-mt.so's DT_NEEDED, but program linker requires that
|
||||||
|
missing symbols are satisfied by direct dependency, not by a
|
||||||
|
transitive one. Hence this linker script, which brings in the
|
||||||
|
Boost.System DSO. */
|
||||||
|
|
||||||
|
INPUT(libboost_thread.so.VERSION)
|
||||||
|
INPUT(libboost_system.so.VERSION)
|
||||||
|
ifdef([HAS_ATOMIC_FLAG_LOCKFREE],[],
|
||||||
|
[
|
||||||
|
/* If the given architecture doesn't have lock-free implementation of
|
||||||
|
boost::atomic_flag, the dependency on Boost.Atomic may leak from
|
||||||
|
the header files to client binaries. */
|
||||||
|
|
||||||
|
INPUT(libboost_atomic.so.VERSION)
|
||||||
|
])dnl
|
Loading…
Reference in New Issue
Block a user