summaryrefslogtreecommitdiff
path: root/boost
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-01-09 11:10:12 +0000
committerCaolán McNamara <caolanm@redhat.com>2012-01-09 13:28:38 +0000
commitc8352a6c19489ba7e74d1bfbe0e94b783d9db580 (patch)
tree7a3b9319e36fa3b2dc619acc147168be70c183fe /boost
parent45b19123a63f23fe37b11b063d7567bf79ef09aa (diff)
WaE: some more warnings in higher debug levels
Diffstat (limited to 'boost')
-rw-r--r--boost/boost.3780.aliasing.patch (renamed from boost/aliasing.patch)0
-rw-r--r--boost/boost.5119.unordered_map-cp-ctor.patch (renamed from boost/unordered_map-doesnt-support-cp-ctor.patch)0
-rw-r--r--boost/boost.6369.warnings.patch305
-rw-r--r--boost/makefile.mk6
4 files changed, 309 insertions, 2 deletions
diff --git a/boost/aliasing.patch b/boost/boost.3780.aliasing.patch
index 5ca5ed07ba65..5ca5ed07ba65 100644
--- a/boost/aliasing.patch
+++ b/boost/boost.3780.aliasing.patch
diff --git a/boost/unordered_map-doesnt-support-cp-ctor.patch b/boost/boost.5119.unordered_map-cp-ctor.patch
index 42e71752f975..42e71752f975 100644
--- a/boost/unordered_map-doesnt-support-cp-ctor.patch
+++ b/boost/boost.5119.unordered_map-cp-ctor.patch
diff --git a/boost/boost.6369.warnings.patch b/boost/boost.6369.warnings.patch
new file mode 100644
index 000000000000..545f9c09c8c4
--- /dev/null
+++ b/boost/boost.6369.warnings.patch
@@ -0,0 +1,305 @@
+--- misc/boost_1_44_0/boost/date_time/gregorian/gregorian_io.hpp 2012-01-08 20:16:41.321760852 +0000
++++ misc/build/boost_1_44_0/boost/date_time/gregorian/gregorian_io.hpp 2012-01-08 20:25:43.233484675 +0000
+@@ -77,14 +77,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, d);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, d);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, d);
+@@ -138,14 +138,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, dd);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, dd);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, dd);
+@@ -202,14 +202,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, dp);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, dp);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, dp);
+@@ -261,14 +261,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, m);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, m);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, m);
+@@ -318,14 +318,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, wd);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, wd);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, wd);
+@@ -359,14 +359,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, gd);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, gd);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, gd);
+@@ -400,14 +400,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, gy);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, gy);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, gy);
+@@ -458,14 +458,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, pd);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, pd);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, pd);
+@@ -515,14 +515,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, nday);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, nday);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, nday);
+@@ -573,14 +573,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, fkd);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, fkd);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, fkd);
+@@ -631,14 +631,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, lkd);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, lkd);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, lkd);
+@@ -690,14 +690,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, fka);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, fka);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, fka);
+@@ -749,14 +749,14 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::date_input_facet<date, CharT> date_input_facet;
++ typedef typename date_time::date_input_facet<date, CharT> lcl_date_input_facet;
+
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<date_input_facet>(is.getloc())) {
+- std::use_facet<date_input_facet>(is.getloc()).get(sit, str_end, is, fkb);
++ if(std::has_facet<lcl_date_input_facet>(is.getloc())) {
++ std::use_facet<lcl_date_input_facet>(is.getloc()).get(sit, str_end, is, fkb);
+ }
+ else {
+- date_input_facet* f = new date_input_facet();
++ lcl_date_input_facet* f = new lcl_date_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, fkb);
+--- misc/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp 2012-01-08 20:16:41.342761072 +0000
++++ misc/build/boost_1_44_0/boost/date_time/posix_time/posix_time_io.hpp 2012-01-09 09:47:25.426730124 +0000
+@@ -75,13 +75,13 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::time_input_facet<ptime, CharT> time_input_facet;
++ typedef typename date_time::time_input_facet<ptime, CharT> lcl_time_input_facet;
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<time_input_facet>(is.getloc())) {
+- std::use_facet<time_input_facet>(is.getloc()).get(sit, str_end, is, pt);
++ if(std::has_facet<lcl_time_input_facet>(is.getloc())) {
++ std::use_facet<lcl_time_input_facet>(is.getloc()).get(sit, str_end, is, pt);
+ }
+ else {
+- time_input_facet* f = new time_input_facet();
++ lcl_time_input_facet* f = new lcl_time_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, pt);
+@@ -143,13 +143,13 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::time_input_facet<ptime, CharT> time_input_facet;
++ typedef typename date_time::time_input_facet<ptime, CharT> lcl_time_input_facet;
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<time_input_facet>(is.getloc())) {
+- std::use_facet<time_input_facet>(is.getloc()).get(sit, str_end, is, tp);
++ if(std::has_facet<lcl_time_input_facet>(is.getloc())) {
++ std::use_facet<lcl_time_input_facet>(is.getloc()).get(sit, str_end, is, tp);
+ }
+ else {
+- time_input_facet* f = new time_input_facet();
++ lcl_time_input_facet* f = new lcl_time_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, tp);
+@@ -208,13 +208,13 @@
+ typename std::basic_istream<CharT, Traits>::sentry strm_sentry(is, false);
+ if (strm_sentry) {
+ try {
+- typedef typename date_time::time_input_facet<ptime, CharT> time_input_facet;
++ typedef typename date_time::time_input_facet<ptime, CharT> lcl_time_input_facet;
+ std::istreambuf_iterator<CharT,Traits> sit(is), str_end;
+- if(std::has_facet<time_input_facet>(is.getloc())) {
+- std::use_facet<time_input_facet>(is.getloc()).get(sit, str_end, is, td);
++ if(std::has_facet<lcl_time_input_facet>(is.getloc())) {
++ std::use_facet<lcl_time_input_facet>(is.getloc()).get(sit, str_end, is, td);
+ }
+ else {
+- time_input_facet* f = new time_input_facet();
++ lcl_time_input_facet* f = new lcl_time_input_facet();
+ std::locale l = std::locale(is.getloc(), f);
+ is.imbue(l);
+ f->get(sit, str_end, is, td);
diff --git a/boost/makefile.mk b/boost/makefile.mk
index 3ba21d8c66c8..085e1c71f279 100644
--- a/boost/makefile.mk
+++ b/boost/makefile.mk
@@ -52,13 +52,15 @@ TARFILE_NAME=boost_1_44_0
TARFILE_MD5=f02578f5218f217a9f20e9c30e119c6a
PATCH_FILES=$(TARFILE_NAME).patch
#https://svn.boost.org/trac/boost/ticket/3780
-PATCH_FILES+=aliasing.patch
+PATCH_FILES+=boost.3780.aliasing.patch
#https://svn.boost.org/trac/boost/ticket/4713
PATCH_FILES+=boost.4713.warnings.patch
#https://svn.boost.org/trac/boost/ticket/5119
-PATCH_FILES+=unordered_map-doesnt-support-cp-ctor.patch
+PATCH_FILES+=boost.5119.unordered_map-cp-ctor.patch
#http://gcc.gnu.org/bugzilla/show_bug.cgi?id=47679
PATCH_FILES+=boost.gcc47679.patch
+#https://svn.boost.org/trac/boost/ticket/6369
+PATCH_FILES+=boost.6369.warnings.patch
PATCH_FILES+=boost.windows.patch