Commit 26bddba3 by Jonathan Wakely Committed by Jonathan Wakely

Fixes to Doxygen comments in libstdc++ headers

	* include/bits/refwrap.h: Fix Doxygen warning.
	* include/bits/specfun.h: Likewise.
	* include/bits/std_function.h: Likewise.
	* include/bits/stl_algo.h (set_union, set_intersection)
	(set_difference, set_symmetric_difference): Add Doxygen @param tags
	for output iterator parameters.
	* include/bits/stl_iterator.h (inserter): Add Doxygen @param tag for
	iterator parameter.
	* include/std/mutex (try_lock, lock): Change Mutex to Lockable in
	Doxygen comments.

From-SVN: r248160
parent 539f481a
2017-05-17 Jonathan Wakely <jwakely@redhat.com>
* include/bits/refwrap.h: Fix Doxygen warning.
* include/bits/specfun.h: Likewise.
* include/bits/std_function.h: Likewise.
* include/bits/stl_algo.h (set_union, set_intersection)
(set_difference, set_symmetric_difference): Add Doxygen @param tags
for output iterator parameters.
* include/bits/stl_iterator.h (inserter): Add Doxygen @param tag for
iterator parameter.
* include/std/mutex (try_lock, lock): Change Mutex to Lockable in
Doxygen comments.
2017-05-17 Ville Voutilainen <ville.voutilainen@gmail.com> 2017-05-17 Ville Voutilainen <ville.voutilainen@gmail.com>
Implement new C++ intrinsics __is_assignable and __is_constructible. Implement new C++ intrinsics __is_assignable and __is_constructible.
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>. // <http://www.gnu.org/licenses/>.
/** @file include/bits/bind.h /** @file include/bits/refwrap.h
* This is an internal header file, included by other library headers. * This is an internal header file, included by other library headers.
* Do not attempt to use it directly. @headername{functional} * Do not attempt to use it directly. @headername{functional}
*/ */
......
...@@ -118,8 +118,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -118,8 +118,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
* versions of this math library because of implementation concerns. * versions of this math library because of implementation concerns.
* However, since they were in the TR1 version and since they are popular * However, since they were in the TR1 version and since they are popular
* we kept them as an extension in namespace @c __gnu_cxx: * we kept them as an extension in namespace @c __gnu_cxx:
* - @ref conf_hyperg "conf_hyperg - Confluent hypergeometric functions" * - @ref __gnu_cxx::conf_hyperg "conf_hyperg - Confluent hypergeometric functions"
* - @ref hyperg "hyperg - Hypergeometric functions" * - @ref __gnu_cxx::hyperg "hyperg - Hypergeometric functions"
* *
* @section general General Features * @section general General Features
* *
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>. // <http://www.gnu.org/licenses/>.
/** @file include/bits/function.h /** @file include/bits/std_function.h
* This is an internal header file, included by other library headers. * This is an internal header file, included by other library headers.
* Do not attempt to use it directly. @headername{functional} * Do not attempt to use it directly. @headername{functional}
*/ */
......
...@@ -5103,6 +5103,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5103,6 +5103,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @param __last1 End of first range. * @param __last1 End of first range.
* @param __first2 Start of second range. * @param __first2 Start of second range.
* @param __last2 End of second range. * @param __last2 End of second range.
* @param __result Start of output range.
* @return End of the output range. * @return End of the output range.
* @ingroup set_algorithms * @ingroup set_algorithms
* *
...@@ -5151,6 +5152,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5151,6 +5152,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @param __last1 End of first range. * @param __last1 End of first range.
* @param __first2 Start of second range. * @param __first2 Start of second range.
* @param __last2 End of second range. * @param __last2 End of second range.
* @param __result Start of output range.
* @param __comp The comparison functor. * @param __comp The comparison functor.
* @return End of the output range. * @return End of the output range.
* @ingroup set_algorithms * @ingroup set_algorithms
...@@ -5223,6 +5225,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5223,6 +5225,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @param __last1 End of first range. * @param __last1 End of first range.
* @param __first2 Start of second range. * @param __first2 Start of second range.
* @param __last2 End of second range. * @param __last2 End of second range.
* @param __result Start of output range.
* @return End of the output range. * @return End of the output range.
* @ingroup set_algorithms * @ingroup set_algorithms
* *
...@@ -5269,6 +5272,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5269,6 +5272,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @param __last1 End of first range. * @param __last1 End of first range.
* @param __first2 Start of second range. * @param __first2 Start of second range.
* @param __last2 End of second range. * @param __last2 End of second range.
* @param __result Start of output range.
* @param __comp The comparison functor. * @param __comp The comparison functor.
* @return End of the output range. * @return End of the output range.
* @ingroup set_algorithms * @ingroup set_algorithms
...@@ -5341,6 +5345,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5341,6 +5345,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @param __last1 End of first range. * @param __last1 End of first range.
* @param __first2 Start of second range. * @param __first2 Start of second range.
* @param __last2 End of second range. * @param __last2 End of second range.
* @param __result Start of output range.
* @return End of the output range. * @return End of the output range.
* @ingroup set_algorithms * @ingroup set_algorithms
* *
...@@ -5389,6 +5394,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5389,6 +5394,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @param __last1 End of first range. * @param __last1 End of first range.
* @param __first2 Start of second range. * @param __first2 Start of second range.
* @param __last2 End of second range. * @param __last2 End of second range.
* @param __result Start of output range.
* @param __comp The comparison functor. * @param __comp The comparison functor.
* @return End of the output range. * @return End of the output range.
* @ingroup set_algorithms * @ingroup set_algorithms
...@@ -5471,6 +5477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5471,6 +5477,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @param __last1 End of first range. * @param __last1 End of first range.
* @param __first2 Start of second range. * @param __first2 Start of second range.
* @param __last2 End of second range. * @param __last2 End of second range.
* @param __result Start of output range.
* @return End of the output range. * @return End of the output range.
* @ingroup set_algorithms * @ingroup set_algorithms
* *
...@@ -5519,6 +5526,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO ...@@ -5519,6 +5526,7 @@ _GLIBCXX_BEGIN_NAMESPACE_ALGO
* @param __last1 End of first range. * @param __last1 End of first range.
* @param __first2 Start of second range. * @param __first2 Start of second range.
* @param __last2 End of second range. * @param __last2 End of second range.
* @param __result Start of output range.
* @param __comp The comparison functor. * @param __comp The comparison functor.
* @return End of the output range. * @return End of the output range.
* @ingroup set_algorithms * @ingroup set_algorithms
......
...@@ -721,6 +721,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -721,6 +721,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
/** /**
* @param __x A container of arbitrary type. * @param __x A container of arbitrary type.
* @param __i An iterator into the container.
* @return An instance of insert_iterator working on @p __x. * @return An instance of insert_iterator working on @p __x.
* *
* This wrapper function helps in creating insert_iterator instances. * This wrapper function helps in creating insert_iterator instances.
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
// see the files COPYING3 and COPYING.RUNTIME respectively. If not, see // see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
// <http://www.gnu.org/licenses/>. // <http://www.gnu.org/licenses/>.
/** @file bits/string_view.tcc /** @file include/bits/string_view.tcc
* This is an internal header file, included by other library headers. * This is an internal header file, included by other library headers.
* Do not attempt to use it directly. @headername{string_view} * Do not attempt to use it directly. @headername{string_view}
*/ */
......
...@@ -507,9 +507,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -507,9 +507,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
}; };
/** @brief Generic try_lock. /** @brief Generic try_lock.
* @param __l1 Meets Mutex requirements (try_lock() may throw). * @param __l1 Meets Lockable requirements (try_lock() may throw).
* @param __l2 Meets Mutex requirements (try_lock() may throw). * @param __l2 Meets Lockable requirements (try_lock() may throw).
* @param __l3 Meets Mutex requirements (try_lock() may throw). * @param __l3 Meets Lockable requirements (try_lock() may throw).
* @return Returns -1 if all try_lock() calls return true. Otherwise returns * @return Returns -1 if all try_lock() calls return true. Otherwise returns
* a 0-based index corresponding to the argument that returned false. * a 0-based index corresponding to the argument that returned false.
* @post Either all arguments are locked, or none will be. * @post Either all arguments are locked, or none will be.
...@@ -527,9 +527,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION ...@@ -527,9 +527,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
} }
/** @brief Generic lock. /** @brief Generic lock.
* @param __l1 Meets Mutex requirements (try_lock() may throw). * @param __l1 Meets Lockable requirements (try_lock() may throw).
* @param __l2 Meets Mutex requirements (try_lock() may throw). * @param __l2 Meets Lockable requirements (try_lock() may throw).
* @param __l3 Meets Mutex requirements (try_lock() may throw). * @param __l3 Meets Lockable requirements (try_lock() may throw).
* @throw An exception thrown by an argument's lock() or try_lock() member. * @throw An exception thrown by an argument's lock() or try_lock() member.
* @post All arguments are locked. * @post All arguments are locked.
* *
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment