Revision: | 1.2 |
Committed: | Tue Oct 4 07:18:22 2011 UTC (13 years, 6 months ago) by eulisse |
Branch: | MAIN |
CVS Tags: | bld_1364477047_CmsTC_slc5_amd64_gcc434, bld_1363597235_CmsTC_slc5_amd64_gcc434, bld_1361358843_CmsTC_slc5_amd64_gcc434, bld_1360935597_CmsTC_slc5_amd64_gcc434, bld_1358942699_CmsTC_slc5_amd64_gcc434, bld_1358853292_CmsTC_slc5_amd64_gcc434, bld_1321637643_reqmon_slc5_amd64_gcc461, HG1111e, bld_1321455789_happyface_slc5_amd64_gcc461, bld_1321454935_happyface_slc5_amd64_gcc461, TW20111103a, TW20111101e, TW20111101d, TW20111101c, TW20111101b, TW20111101a, TW20111028a, bld_1319551575_PHEDEX-combined-agents_slc5_amd64_gcc461, HG1111d, TW20111017d, TW20111017c, TW20111017b, TW20111017a, sjgFor500pre2d-gcc461-ports, sjgFor500pre2c-gcc461-ports, sjgFor500pre2b-gcc461-ports, TW20111016a, TW20111015a, bld_1318622241_wmagent_slc5_amd64_gcc434, TW20111014a, az20111014-50X-gcc461-ports, bld_1318524794_asyncstageout_slc5_amd64_gcc434, bld_1318523430_cmsweb_slc5_amd64_gcc434, HG1111c-gcc434, HG1111c, sjgFor500pre2-gcc461-ports, bld_1318424717_crab-server3_slc5_amd64_gcc434, bld_1318423430_asyncstageout_slc5_amd64_gcc434, LT20111012a, bld_1318410594_crab-server3_slc5_amd64_gcc434, az20111011c-50X-gcc461-ports, az20111011b-50X-gcc461-ports, az20111011a-50X-gcc461-ports, az20111010-50X-gcc461-ports, HG1111b, az20111007-50X-gcc461-ports, az20111005-50X-gcc461-ports, HG1111a-gcc434, HG1111a, az20111004a-50X-gcc461-ports, az20111004-50X-gcc461-ports |
Changes since 1.1: | +26 -0 lines |
Log Message: | Clean up more (hopefully all) boost 1.47.00 warnings with gcc 4.6.1. * Pick up patch for unused, deprecated, statics. * Exclude int_adaptor.hpp from reporting -Wstrict-overflow warnings. |
# | User | Rev | Content |
---|---|---|---|
1 | eulisse | 1.1 | diff --git a/boost/regex/v4/match_results.hpp b/boost/regex/v4/match_results.hpp |
2 | index ca9898f..2eb4782 100644 | ||
3 | --- a/boost/regex/v4/match_results.hpp | ||
4 | +++ b/boost/regex/v4/match_results.hpp | ||
5 | @@ -212,6 +212,9 @@ public: | ||
6 | { | ||
7 | if(m_is_singular && m_subs.empty()) | ||
8 | raise_logic_error(); | ||
9 | + if (sub > (INT_MAX-2)) | ||
10 | + return m_null; | ||
11 | + | ||
12 | sub += 2; | ||
13 | if(sub < (int)m_subs.size() && (sub >= 0)) | ||
14 | { | ||
15 | eulisse | 1.2 | diff --git a/boost/date_time/int_adapter.hpp b/boost/date_time/int_adapter.hpp |
16 | index fc98fc1..fd089ad 100644 | ||
17 | --- a/boost/date_time/int_adapter.hpp | ||
18 | +++ b/boost/date_time/int_adapter.hpp | ||
19 | @@ -20,7 +20,10 @@ | ||
20 | |||
21 | namespace boost { | ||
22 | namespace date_time { | ||
23 | - | ||
24 | +#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6) | ||
25 | +#pragma GCC diagnostic push | ||
26 | +#pragma GCC diagnostic ignored "-Wstrict-overflow" | ||
27 | +#endif | ||
28 | |||
29 | //! Adapter to create integer types with +-infinity, and not a value | ||
30 | /*! This class is used internally in counted date/time representations. | ||
31 | @@ -504,6 +505,8 @@ private: | ||
32 | |||
33 | } } //namespace date_time | ||
34 | |||
35 | - | ||
36 | +#if defined(__GNUC__) && (__GNUC__ >= 4) && (__GNUC_MINOR__ >= 6) | ||
37 | +#pragma GCC diagnostic pop | ||
38 | +#endif | ||
39 | |||
40 | #endif |