Ticket #6003: occurred-patch.txt

File occurred-patch.txt, 18.5 KB (added by Akim Demaille <akim.demaille@…>, 11 years ago)
Line 
1Index: boost/xpressive/regex_constants.hpp
2===================================================================
3--- boost/xpressive/regex_constants.hpp (revision 74895)
4+++ boost/xpressive/regex_constants.hpp (working copy)
5@@ -232,7 +232,7 @@
6 ///<
7 error_badattr, ///< Tried to read from an uninitialized attribute.
8 ///<
9- error_internal ///< An internal error has occured.
10+ error_internal ///< An internal error has occurred.
11 ///<
12 };
13
14Index: boost/geometry/extensions/contrib/ttmath/ttmathparser.h
15===================================================================
16--- boost/geometry/extensions/contrib/ttmath/ttmathparser.h (revision 74895)
17+++ boost/geometry/extensions/contrib/ttmath/ttmathparser.h (working copy)
18@@ -324,7 +324,7 @@
19
20 /*!
21 pointer to the currently reading char
22- when an error has occured it may be used to count the index of the wrong character
23+ when an error has occurred it may be used to count the index of the wrong character
24 */
25 const char * pstring;
26
27Index: boost/regex/v4/basic_regex_parser.hpp
28===================================================================
29--- boost/regex/v4/basic_regex_parser.hpp (revision 74895)
30+++ boost/regex/v4/basic_regex_parser.hpp (working copy)
31@@ -200,9 +200,9 @@
32 if(error_code != regex_constants::error_empty)
33 {
34 if((start_pos != 0) || (end_pos != (m_end - m_base)))
35- message += " The error occured while parsing the regular expression fragment: '";
36+ message += " The error occurred while parsing the regular expression fragment: '";
37 else
38- message += " The error occured while parsing the regular expression: '";
39+ message += " The error occurred while parsing the regular expression: '";
40 if(start_pos != end_pos)
41 {
42 message += std::string(m_base + start_pos, m_base + position);
43Index: boost/spirit/repository/home/qi/operator/keywords.hpp
44===================================================================
45--- boost/spirit/repository/home/qi/operator/keywords.hpp (revision 74895)
46+++ boost/spirit/repository/home/qi/operator/keywords.hpp (working copy)
47@@ -464,7 +464,7 @@
48
49 // We have a bool array 'flags' with one flag for each parser as well as a 'counter'
50 // array.
51- // The kwd directive sets and increments the counter when a successeful parse occured
52+ // The kwd directive sets and increments the counter when a successeful parse occurred
53 // as well as the slot of the corresponding parser to true in the flags array as soon
54 // the minimum repetition requirement is met and keeps that value to true as long as
55 // the maximum repetition requirement is met.
56@@ -538,7 +538,7 @@
57
58 // We have a bool array 'flags' with one flag for each parser as well as a 'counter'
59 // array.
60- // The kwd directive sets and increments the counter when a successeful parse occured
61+ // The kwd directive sets and increments the counter when a successeful parse occurred
62 // as well as the slot of the corresponding parser to true in the flags array as soon
63 // the minimum repetition requirement is met and keeps that value to true as long as
64 // the maximum repetition requirement is met.
65Index: boost/property_tree/detail/rapidxml.hpp
66===================================================================
67--- boost/property_tree/detail/rapidxml.hpp (revision 74895)
68+++ boost/property_tree/detail/rapidxml.hpp (working copy)
69@@ -65,7 +65,7 @@
70
71 //! Gets pointer to character data where error happened.
72 //! Ch should be the same as char type of xml_document that produced the error.
73- //! \return Pointer to location within the parsed string where error occured.
74+ //! \return Pointer to location within the parsed string where error occurred.
75 template<class Ch>
76 Ch *where() const
77 {
78Index: boost/test/impl/execution_monitor.ipp
79===================================================================
80--- boost/test/impl/execution_monitor.ipp (revision 74895)
81+++ boost/test/impl/execution_monitor.ipp (working copy)
82@@ -538,7 +538,7 @@
83 #endif
84 default:
85 report_error( execution_exception::system_error,
86- "signal: SIGPOLL, si_code: %d (asynchronous I/O event occured; band event %d)",
87+ "signal: SIGPOLL, si_code: %d (asynchronous I/O event occurred; band event %d)",
88 (int)m_sig_info->si_band, m_sig_info->si_code );
89 break;
90 }
91Index: boost/asio/basic_serial_port.hpp
92===================================================================
93--- boost/asio/basic_serial_port.hpp (revision 74895)
94+++ boost/asio/basic_serial_port.hpp (working copy)
95@@ -445,7 +445,7 @@
96 *
97 * @param option The option value to be obtained from the serial port.
98 *
99- * @param ec Set to indicate what error occured, if any.
100+ * @param ec Set to indicate what error occurred, if any.
101 *
102 * @sa GettableSerialPortOption @n
103 * boost::asio::serial_port_base::baud_rate @n
104Index: libs/mpi/src/python/documentation.cpp
105===================================================================
106--- libs/mpi/src/python/documentation.cpp (revision 74895)
107+++ libs/mpi/src/python/documentation.cpp (working copy)
108@@ -302,7 +302,7 @@
109 "the effect of MPI errors.\n";
110
111 const char* exception_what_docstring =
112- "A description of the error that occured. At present, this refers\n"
113+ "A description of the error that occurred. At present, this refers\n"
114 "only to the name of the MPI routine that failed.\n";
115
116 const char* exception_routine_docstring =
117Index: libs/unordered/test/helpers/invariants.hpp
118===================================================================
119--- libs/unordered/test/helpers/invariants.hpp (revision 74895)
120+++ libs/unordered/test/helpers/invariants.hpp (working copy)
121@@ -38,7 +38,7 @@
122 it = x1.begin(), end = x1.end();
123 BOOST_DEDUCED_TYPENAME X::size_type size = 0;
124 while(it != end) {
125- // First test that the current key has not occured before, required
126+ // First test that the current key has not occurred before, required
127 // to test either that keys are unique or that equivalent keys are
128 // adjacent. (6.3.1/6)
129 key_type key = get_key<X>(*it);
130Index: libs/graph/doc/r_c_shortest_paths.html
131===================================================================
132--- libs/graph/doc/r_c_shortest_paths.html (revision 74895)
133+++ libs/graph/doc/r_c_shortest_paths.html (working copy)
134@@ -547,7 +547,7 @@
135 </ul>
136
137 <p>
138-<tt>ed_last_extended_arc</tt> stores the edge descriptor of the last extended arc. If <tt>ed_vec_path</tt> is a path of positive length and <tt>b_feasible==false</tt>, <tt>ed_last_extended_arc</tt> is the edge descriptor of the arc at whose target vertex the first violation of a resource window occured.
139+<tt>ed_last_extended_arc</tt> stores the edge descriptor of the last extended arc. If <tt>ed_vec_path</tt> is a path of positive length and <tt>b_feasible==false</tt>, <tt>ed_last_extended_arc</tt> is the edge descriptor of the arc at whose target vertex the first violation of a resource window occurred.
140 </p>
141
142 <h3>Examples</h3>
143Index: libs/serialization/doc/exceptions.html
144===================================================================
145--- libs/serialization/doc/exceptions.html (revision 74895)
146+++ libs/serialization/doc/exceptions.html (working copy)
147@@ -184,7 +184,7 @@
148 <br>
149 <a name="output_stream_error"><code style="white-space: normal">output_stream_error</code></a>
150 </h3>
151-An error has occured during stream input or ouput. Aside from the common
152+An error has occurred during stream input or ouput. Aside from the common
153 situations such as a corrupted or truncated input file, there are
154 several less obvious ones that sometimes occur.
155 <p>
156Index: libs/integer/test/integer_test.cpp
157===================================================================
158--- libs/integer/test/integer_test.cpp (revision 74895)
159+++ libs/integer/test/integer_test.cpp (working copy)
160@@ -152,7 +152,7 @@
161 if(boost::detail::test_errors() != last_error_count)
162 {
163 last_error_count = boost::detail::test_errors();
164- std::cout << "Errors occured while testing with bit count = " << Bits << std::endl;
165+ std::cout << "Errors occurred while testing with bit count = " << Bits << std::endl;
166 std::cout << "Type int_t<" << Bits << ">::least was " << get_name_of_type(least_int(0)) << std::endl;
167 std::cout << "Type int_t<" << Bits << ">::fast was " << get_name_of_type(fast_int(0)) << std::endl;
168 std::cout << "Type uint_t<" << Bits << ">::least was " << get_name_of_type(least_uint(0)) << std::endl;
169Index: libs/icl/test/fix_include_after_thread_/fix_include_after_thread.cpp
170===================================================================
171--- libs/icl/test/fix_include_after_thread_/fix_include_after_thread.cpp (revision 74895)
172+++ libs/icl/test/fix_include_after_thread_/fix_include_after_thread.cpp (working copy)
173@@ -19,7 +19,7 @@
174 // ->(some_attribute<Type>::value)
175 //The problem does not occur for gcc compilers.
176
177-// #include <boost/thread.hpp> MEMO: The problem occured when using thread.hpp
178+// #include <boost/thread.hpp> MEMO: The problem occurred when using thread.hpp
179 #include <boost/bind.hpp> // but is also triggered from bind.hpp alone
180 // while the cause of it is an error in the msvc-7.1 to 10.0 compilers.
181 // A minimal example is provided by test case 'cmp_msvc_value_born_error'
182Index: libs/icl/test/fix_icl_after_thread_/fix_icl_after_thread.cpp
183===================================================================
184--- libs/icl/test/fix_icl_after_thread_/fix_icl_after_thread.cpp (revision 74895)
185+++ libs/icl/test/fix_icl_after_thread_/fix_icl_after_thread.cpp (working copy)
186@@ -9,7 +9,7 @@
187 #include <libs/icl/test/disable_test_warnings.hpp>
188 #include "../unit_test_unwarned.hpp"
189
190-// #include <boost/thread.hpp> MEMO: The problem occured when using thread.hpp
191+// #include <boost/thread.hpp> MEMO: The problem occurred when using thread.hpp
192 #include <boost/bind.hpp> // but is also triggered from bind.hpp alone
193 // while the cause of it is an error in the msvc-7.1 to 10.0 compilers.
194 // A minimal example is provided by test case 'cmp_msvc_value_born_error'
195Index: libs/regex/doc/html/boost_regex/background_information/history.html
196===================================================================
197--- libs/regex/doc/html/boost_regex/background_information/history.html (revision 74895)
198+++ libs/regex/doc/html/boost_regex/background_information/history.html (working copy)
199@@ -278,7 +278,7 @@
200 types used previously - bad_expression and bad_pattern - are now just
201 typedefs for regex_error. Type regex_error has a couple of new members:
202 code() to report an error code rather than a string, and position() to
203- report where in the expression the error occured.
204+ report where in the expression the error occurred.
205 </li>
206 </ul></div>
207 <a name="boost_regex.background_information.history.boost_1_32_1"></a><h5>
208Index: libs/regex/doc/history.qbk
209===================================================================
210--- libs/regex/doc/history.qbk (revision 74895)
211+++ libs/regex/doc/history.qbk (working copy)
212@@ -119,7 +119,7 @@
213 * Added Unicode support; based on ICU.
214 * Changed newline support to recognise \\f as a line separator (all character types), and \\x85 as a line separator for wide characters / Unicode only.
215 * Added a new format flag format_literal that treats the replace string as a literal, rather than a Perl or Sed style format string.
216-* Errors are now reported by throwing exceptions of type regex_error. The types used previously - bad_expression and bad_pattern - are now just typedefs for regex_error. Type regex_error has a couple of new members: code() to report an error code rather than a string, and position() to report where in the expression the error occured.
217+* Errors are now reported by throwing exceptions of type regex_error. The types used previously - bad_expression and bad_pattern - are now just typedefs for regex_error. Type regex_error has a couple of new members: code() to report an error code rather than a string, and position() to report where in the expression the error occurred.
218
219 [h4 Boost 1.32.1]
220
221Index: libs/test/doc/src/UTF.log.xsd
222===================================================================
223--- libs/test/doc/src/UTF.log.xsd (revision 74895)
224+++ libs/test/doc/src/UTF.log.xsd (working copy)
225@@ -35,7 +35,7 @@
226 <xs:sequence>
227 <xs:element name="LastCheckpoint" type="LogEntry">
228 <xs:annotation>
229- <xs:documentation>Location of last checkpoint before exception occured</xs:documentation>
230+ <xs:documentation>Location of last checkpoint before exception occurred</xs:documentation>
231 </xs:annotation>
232 </xs:element>
233 </xs:sequence>
234@@ -69,17 +69,17 @@
235 </xs:element>
236 <xs:element name="Error" type="LogEntry">
237 <xs:annotation>
238- <xs:documentation>Log entry corresponding to the non-fatal error occured during test execution</xs:documentation>
239+ <xs:documentation>Log entry corresponding to the non-fatal error occurred during test execution</xs:documentation>
240 </xs:annotation>
241 </xs:element>
242 <xs:element name="FatalError" type="LogEntry">
243 <xs:annotation>
244- <xs:documentation>Log entry corresponding to the fatal error occured during test execution</xs:documentation>
245+ <xs:documentation>Log entry corresponding to the fatal error occurred during test execution</xs:documentation>
246 </xs:annotation>
247 </xs:element>
248 <xs:element name="Exception" type="ExceptionEntry">
249 <xs:annotation>
250- <xs:documentation>Log entry corresponding to an exception occured during test execution</xs:documentation>
251+ <xs:documentation>Log entry corresponding to an exception occurred during test execution</xs:documentation>
252 </xs:annotation>
253 </xs:element>
254 </xs:choice>
255Index: libs/asio/doc/reference.qbk
256===================================================================
257--- libs/asio/doc/reference.qbk (revision 74895)
258+++ libs/asio/doc/reference.qbk (working copy)
259@@ -21897,7 +21897,7 @@
260
261 [[option][The option value to be obtained from the serial port.]]
262
263-[[ec][Set to indicate what error occured, if any.]]
264+[[ec][Set to indicate what error occurred, if any.]]
265
266 ]
267
268Index: libs/iostreams/doc/classes/gzip.html
269===================================================================
270--- libs/iostreams/doc/classes/gzip.html (revision 74895)
271+++ libs/iostreams/doc/classes/gzip.html (working copy)
272@@ -104,7 +104,7 @@
273 <TR><TH>Constant</TH><TH>Interpretation</TH></TR>
274 <TR>
275 <TD VALIGN="top"><A NAME="zlib_error"></A><CODE>zlib_error</CODE></TD>
276- <TD>A zlib error has occured; use <A HREF="#gzip_error_zlib_error_code"><CODE>gzip_error::zlib_error_code</CODE></A> to obtain an error code.</TD>
277+ <TD>A zlib error has occurred; use <A HREF="#gzip_error_zlib_error_code"><CODE>gzip_error::zlib_error_code</CODE></A> to obtain an error code.</TD>
278 </TR>
279 <TR>
280 <TD VALIGN="top"><A NAME="bad_crc"></A><CODE>bad_crc</CODE></TD>
281Index: libs/iostreams/doc/functions/flush.html
282===================================================================
283--- libs/iostreams/doc/functions/flush.html (revision 74895)
284+++ libs/iostreams/doc/functions/flush.html (working copy)
285@@ -27,7 +27,7 @@
286 The function template <CODE>flush</CODE> attemps to flush all buffered characters downstream. It is provided to facilite modifiying a filter chain in the middle of a sequence of output operations; specifically, it is used to implement the function <CODE>strict_sync</CODE> (<I>see</I>, <I>e.g.</I>, <A HREF='../classes/filtering_stream.html#strict_sync'><CODE>filtering_stream::strict_sync</CODE></A>). If <CODE>strict_sync</CODE> succeeds, the auto-close feature of a filter chain can be safely disabled using <CODE>set_auto_close(false)</CODE> (<I>see</I>, <I>e.g.</I>, <A HREF='../classes/filtering_stream.html#set_auto_close'><CODE>filtering_stream::set_auto_close</CODE></A>). Filters can then be added to or removed from the chain with the knowledge that no characters remain buffered.
287 </P>
288 <P>
289- For non-<A HREF='../concepts/flushable.html'>Flushable</A> devices, <CODE>flush</CODE> returns <CODE>true</CODE>, indicating that no error has occured.<A CLASS='footnote_ref' NAME='note_1_ref' HREF="#note_1"><SUP>[1]</SUP></A> For non-<A HREF='../concepts/flushable.html'>Flushable</A> filters, however, <CODE>flush</CODE> returns <CODE>false</CODE>, indicating that some characters may remain buffered.
290+ For non-<A HREF='../concepts/flushable.html'>Flushable</A> devices, <CODE>flush</CODE> returns <CODE>true</CODE>, indicating that no error has occurred.<A CLASS='footnote_ref' NAME='note_1_ref' HREF="#note_1"><SUP>[1]</SUP></A> For non-<A HREF='../concepts/flushable.html'>Flushable</A> filters, however, <CODE>flush</CODE> returns <CODE>false</CODE>, indicating that some characters may remain buffered.
291 </P>
292 <P>
293 When working with Devices, <CODE>flush</CODE> may be used as a generic version of <CODE>std::basic_ostream::flush()</CODE>.
294Index: tools/build/v2/engine/scan.h
295===================================================================
296--- tools/build/v2/engine/scan.h (revision 74895)
297+++ tools/build/v2/engine/scan.h (working copy)
298@@ -14,7 +14,7 @@
299 * yylex() - parse the next token, returning its type.
300 * yymode() - adjust lexicon of scanner.
301 * yyparse() - declaration for yacc parser.
302- * yyanyerrors() - indicate if any parsing errors occured.
303+ * yyanyerrors() - indicate if any parsing errors occurred.
304 *
305 * The yymode() function is for the parser to adjust the lexicon of the scanner.
306 * Aside from normal keyword scanning, there is a mode to handle action strings
307Index: tools/build/v2/engine/boehm_gc/dyn_load.c
308===================================================================
309--- tools/build/v2/engine/boehm_gc/dyn_load.c (revision 74895)
310+++ tools/build/v2/engine/boehm_gc/dyn_load.c (working copy)
311@@ -898,7 +898,7 @@
312 /* Get info about next shared library */
313 status = shl_get(index, &shl_desc);
314
315- /* Check if this is the end of the list or if some error occured */
316+ /* Check if this is the end of the list or if some error occurred */
317 if (status != 0) {
318 # ifdef GC_HPUX_THREADS
319 /* I've seen errno values of 0. The man page is not clear */