Merge lp:~michihenning/unity-api/doc-comment-fixes into lp:unity-api

Proposed by Michi Henning
Status: Merged
Approved by: Marcus Tomlinson
Approved revision: 141
Merged at revision: 144
Proposed branch: lp:~michihenning/unity-api/doc-comment-fixes
Merge into: lp:unity-api
Diff against target: 110 lines (+22/-22)
1 file modified
include/unity/util/ResourcePtr.h (+22/-22)
To merge this branch: bzr merge lp:~michihenning/unity-api/doc-comment-fixes
Reviewer Review Type Date Requested Status
Marcus Tomlinson (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+224540@code.launchpad.net

Commit message

A few minor fixes to the doc comments for comparison operators.

Description of the change

A few minor fixes to the doc comments for comparison operators.

To post a comment you must log in.
141. By Michi Henning

Oops, a few more corresponding comment fixes.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Anyone feel like reviewing this?

Revision history for this message
Michi Henning (michihenning) wrote :

Please? Pretty, please?

Cheap karma points up for grabs here!

Revision history for this message
Marcus Tomlinson (marcustomlinson) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'include/unity/util/ResourcePtr.h'
2--- include/unity/util/ResourcePtr.h 2013-12-13 12:04:56 +0000
3+++ include/unity/util/ResourcePtr.h 2014-06-25 23:47:02 +0000
4@@ -473,12 +473,12 @@
5 }
6
7 /**
8-\brief Compares two instances for equality by calling the corresponding operator on the resource.
9+\brief Compares two instances for equality.
10
11 Two instances that do not hold a resource are equal. An instance that does not hold a resource is not equal
12 to any instance that holds a resource.
13
14-If the underlying operator throws an exception, that exception is propagated to the caller.
15+If the underlying <code>operator==</code> throws an exception, that exception is propagated to the caller.
16
17 \note This operator is available only if the underlying resource provides <code>operator==</code>.
18 */
19@@ -510,11 +510,11 @@
20 }
21
22 /**
23-\brief Compares two instances for inequality by calling the corresponding operator on the resource.
24-
25-If the underlying operator throws an exception, that exception is propagated to the caller.
26-
27-\note This operator is available only if the underlying resource provides <code>operator!=</code>.
28+\brief Compares two instances for inequality.
29+
30+If the underlying <code>operator==</code> throws an exception, that exception is propagated to the caller.
31+
32+\note This operator is available only if the underlying resource provides <code>operator==</code>.
33 */
34
35 template<typename R, typename D>
36@@ -525,12 +525,11 @@
37 }
38
39 /**
40-\brief Returns <code>true</code> if <code>this</code> is less than <code>rhs</code> by calling the
41-corresponding operator on the resource.
42+\brief Returns <code>true</code> if <code>this</code> is less than <code>rhs</code>.
43
44 An instance that does not hold a resource is less than any instance that holds a resource.
45
46-If the underlying operator throws an exception, that exception is propagated to the caller.
47+If the underlying <code>operator\<</code> throws an exception, that exception is propagated to the caller.
48
49 \note This operator is available only if the underlying resource provides <code>operator\<</code>.
50 */
51@@ -562,15 +561,16 @@
52 }
53
54 /**
55-\brief Returns <code>true</code> if <code>this</code> is less than or equal to <code>rhs</code> by calling the
56-corresponding operator on the resource.
57+\brief Returns <code>true</code> if <code>this</code> is less than or equal to <code>rhs</code>.
58
59 An instance that does not hold a resource is less than any instance that holds a resource.
60 Two instances that do not hold a resource are equal.
61
62-If the underlying operator throws an exception, that exception is propagated to the caller.
63+If the underlying <code>operator\<</code> or <code>operator==</code> throws an exception,
64+that exception is propagated to the caller.
65
66-\note This operator is available only if the underlying resource provides <code>operator\<=</code>.
67+\note This operator is available only if the underlying resource provides <code>operator\<</code>
68+and <code>operator==</code>.
69 */
70
71 template<typename R, typename D>
72@@ -596,14 +596,15 @@
73 }
74
75 /**
76-\brief Returns <code>true</code> if <code>this</code> is greater than <code>rhs</code> by calling the
77-corresponding operator on the resource.
78+\brief Returns <code>true</code> if <code>this</code> is greater than <code>rhs</code>.
79
80 An instance that holds a resource is greater than any instance that does not hold a resource.
81
82-If the underlying operator throws an exception, that exception is propagated to the caller.
83+If the underlying <code>operator\<</code> or <code>operator==</code> throws an exception,
84+that exception is propagated to the caller.
85
86-\note This operator is available only if the underlying resource provides <code>operator\></code>.
87+\note This operator is available only if the underlying resource provides <code>operator\<</code>
88+and <code>operator==</code>.
89 */
90
91 template<typename R, typename D>
92@@ -614,15 +615,14 @@
93 }
94
95 /**
96-\brief Returns <code>true</code> if <code>this</code> is greater than or equal to <code>rhs</code> by calling the
97-corresponding operator on the resource.
98+\brief Returns <code>true</code> if <code>this</code> is greater than or equal to <code>rhs</code>.
99
100 An instance that holds a resource is greater than any instance that does not hold a resource.
101 Two instances that do not hold a resource are equal.
102
103-If the underlying operator throws an exception, that exception is propagated to the caller.
104+If the underlying <code>operator\<</code> throws an exception, that exception is propagated to the caller.
105
106-\note This operator is available only if the underlying resource provides <code>operator\>=</code>.
107+\note This operator is available only if the underlying resource provides <code>operator\<</code>.
108 */
109
110 template<typename R, typename D>

Subscribers

People subscribed via source and target branches

to all changes: