Ticket #992: boost_1_34warnings_patch.txt

File boost_1_34warnings_patch.txt, 6.9 KB (added by Mat Marcus, 15 years ago)

Patch to allow compilation with stricter warning level under gcc and mac os

Line 
1diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/boost/archive/basic_text_oprimitive.hpp boost/boost/archive/basic_text_oprimitive.hpp
2--- boost_1_34_0/boost/archive/basic_text_oprimitive.hpp 2006-02-04 11:35:36.000000000 -0800
3+++ boost/boost/archive/basic_text_oprimitive.hpp 2007-05-15 00:53:12.750000000 -0700
4@@ -89,7 +89,9 @@
5 void save(const bool t){
6 // trap usage of invalid uninitialized boolean which would
7 // otherwise crash on load.
8+#ifndef NDEBUG
9 int i = t;
10+#endif
11 assert(0 == i || 1 == i);
12 if(os.fail())
13 boost::throw_exception(archive_exception(archive_exception::stream_error));
14diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/boost/archive/basic_xml_archive.hpp boost/boost/archive/basic_xml_archive.hpp
15--- boost_1_34_0/boost/archive/basic_xml_archive.hpp 2005-07-01 22:52:14.000000000 -0700
16+++ boost/boost/archive/basic_xml_archive.hpp 2007-05-23 12:22:35.968750000 -0700
17@@ -36,7 +36,7 @@
18 xml_archive_tag_mismatch,
19 xml_archive_tag_name_error
20 } exception_code;
21- xml_archive_exception(exception_code c)
22+ xml_archive_exception(exception_code /* c */)
23 {}
24 virtual const char *what( ) const throw( )
25 {
26diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/boost/archive/detail/iserializer.hpp boost/boost/archive/detail/iserializer.hpp
27--- boost_1_34_0/boost/archive/detail/iserializer.hpp 2006-05-30 08:56:36.000000000 -0700
28+++ boost/boost/archive/detail/iserializer.hpp 2007-05-23 12:22:35.984375000 -0700
29@@ -121,7 +121,7 @@
30 return boost::serialization::implementation_level<T>::value
31 >= boost::serialization::object_class_info;
32 }
33- virtual bool tracking(const unsigned int flags) const {
34+ virtual bool tracking(const unsigned int /* flags */) const {
35 // if(0 != (flags & no_tracking))
36 // return false;
37 return boost::serialization::tracking_level<T>::value
38diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/boost/archive/detail/oserializer.hpp boost/boost/archive/detail/oserializer.hpp
39--- boost_1_34_0/boost/archive/detail/oserializer.hpp 2006-06-04 07:51:24.000000000 -0700
40+++ boost/boost/archive/detail/oserializer.hpp 2007-05-23 12:22:35.984375000 -0700
41@@ -114,7 +114,7 @@
42 return boost::serialization::implementation_level<T>::value
43 >= boost::serialization::object_class_info;
44 }
45- virtual bool tracking(const unsigned int flags) const {
46+ virtual bool tracking(const unsigned int /* flags */) const {
47 // if(0 != (flags & no_tracking))
48 // return false;
49 return boost::serialization::tracking_level<T>::value == boost::serialization::track_always
50diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/boost/date_time/time_resolution_traits.hpp boost/boost/date_time/time_resolution_traits.hpp
51--- boost_1_34_0/boost/date_time/time_resolution_traits.hpp 2005-08-25 09:27:20.000000000 -0700
52+++ boost/boost/date_time/time_resolution_traits.hpp 2007-05-15 00:53:13.546875000 -0700
53@@ -120,11 +120,11 @@
54 + (fractional_seconds_type(minutes)*60)
55 + seconds)*res_adjust()) + fs) * -1);
56 }
57- else{
58+// else{
59 return (((fractional_seconds_type(hours)*3600)
60 + (fractional_seconds_type(minutes)*60)
61 + seconds)*res_adjust()) + fs;
62- }
63+// }
64 }
65
66 };
67diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/libs/serialization/src/basic_oarchive.cpp boost/libs/serialization/src/basic_oarchive.cpp
68--- boost_1_34_0/libs/serialization/src/basic_oarchive.cpp 2005-07-10 18:37:56.000000000 -0700
69+++ boost/libs/serialization/src/basic_oarchive.cpp 2007-05-23 12:22:36.000000000 -0700
70@@ -196,7 +196,7 @@
71 return false;
72 }
73 void save_object_data(
74- basic_oarchive & ar, const void * x
75+ basic_oarchive & /* ar */, const void * /* x */
76 ) const {
77 assert(false);
78 }
79diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/libs/serialization/src/codecvt_null.cpp boost/libs/serialization/src/codecvt_null.cpp
80--- boost_1_34_0/libs/serialization/src/codecvt_null.cpp 2005-04-23 22:12:22.000000000 -0700
81+++ boost/libs/serialization/src/codecvt_null.cpp 2007-05-23 12:22:36.000000000 -0700
82@@ -18,7 +18,7 @@
83
84 std::codecvt_base::result
85 codecvt_null<wchar_t>::do_out(
86- std::mbstate_t & state,
87+ std::mbstate_t & /* state */,
88 const wchar_t * first1,
89 const wchar_t * last1,
90 const wchar_t * & next1,
91@@ -46,7 +46,7 @@
92
93 std::codecvt_base::result
94 codecvt_null<wchar_t>::do_in(
95- std::mbstate_t & state,
96+ std::mbstate_t & /* state */,
97 const char * first1,
98 const char * last1,
99 const char * & next1,
100diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/libs/serialization/src/extended_type_info.cpp boost/libs/serialization/src/extended_type_info.cpp
101--- boost_1_34_0/libs/serialization/src/extended_type_info.cpp 2006-02-04 12:49:22.000000000 -0800
102+++ boost/libs/serialization/src/extended_type_info.cpp 2007-05-23 12:22:36.000000000 -0700
103@@ -145,7 +145,7 @@
104 m_key = key;
105 }
106 virtual bool
107- less_than(const extended_type_info &rhs) const
108+ less_than(const extended_type_info & /* rhs */) const
109 {
110 assert(false);
111 return false; // to prevent a syntax error
112diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/libs/serialization/src/void_cast.cpp boost/libs/serialization/src/void_cast.cpp
113--- boost_1_34_0/libs/serialization/src/void_cast.cpp 2006-02-04 12:53:18.000000000 -0800
114+++ boost/libs/serialization/src/void_cast.cpp 2007-05-23 12:22:36.000000000 -0700
115@@ -173,12 +173,12 @@
116 class void_caster_argument : public void_caster
117 {
118 virtual void const*
119- upcast( void const* t ) const {
120+ upcast( void const* /* t */ ) const {
121 assert(false);
122 return NULL;
123 }
124 virtual void const*
125- downcast( void const* t ) const {
126+ downcast( void const* /* t */ ) const {
127 assert(false);
128 return NULL;
129 }
130diff --strip-trailing-cr -bruEN -X exclude_from_diff.txt boost_1_34_0/libs/thread/src/mutex.inl boost/libs/thread/src/mutex.inl
131--- boost_1_34_0/libs/thread/src/mutex.inl 2006-12-22 01:38:24.000000000 -0800
132+++ boost/libs/thread/src/mutex.inl 2007-05-13 13:21:10.031250000 -0700
133@@ -24,7 +24,7 @@
134 version_info.dwMajorVersion >= 4)
135 {
136 if (HMODULE kernel_module = GetModuleHandle(TEXT("KERNEL32.DLL")))
137- g_TryEnterCriticalSection = reinterpret_cast<TryEnterCriticalSection_type>(GetProcAddress(kernel_module, TEXT("TryEnterCriticalSection")));
138+ g_TryEnterCriticalSection = reinterpret_cast<TryEnterCriticalSection_type>(GetProcAddress(kernel_module, "TryEnterCriticalSection"));
139 }
140 }