Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
a32a2000
Commit
a32a2000
authored
Nov 26, 2019
by
Gennadiy Rozental
Browse files
Merge pull request #2588 from kuzkry:remove-workaround_g++-incorrect-comments
PiperOrigin-RevId: 282568282
parents
51545ee5
f79ac2ce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
19 deletions
+13
-19
googletest/scripts/gen_gtest_pred_impl.py
googletest/scripts/gen_gtest_pred_impl.py
+2
-3
googletest/test/gtest_pred_impl_unittest.cc
googletest/test/gtest_pred_impl_unittest.cc
+11
-16
No files found.
googletest/scripts/gen_gtest_pred_impl.py
View file @
a32a2000
...
...
@@ -439,9 +439,8 @@ bool PredFunction%(n)s(%(tvs)s) {
return %(v_sum)s > 0;
}
// The following two functions are needed to circumvent a bug in
// gcc 2.95.3, which sometimes has problem with the above template
// function.
// The following two functions are needed because a compiler doesn't have
// a context yet to know which template function must be instantiated.
bool PredFunction%(n)sInt(%(int_vs)s) {
return %(v_sum)s > 0;
}
...
...
googletest/test/gtest_pred_impl_unittest.cc
View file @
a32a2000
...
...
@@ -27,7 +27,7 @@
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// This file is AUTOMATICALLY GENERATED on
0
1/0
2
/2019 by command
// This file is AUTOMATICALLY GENERATED on
1
1/0
5
/2019 by command
// 'gen_gtest_pred_impl.py 5'. DO NOT EDIT BY HAND!
// Regression test for gtest_pred_impl.h
...
...
@@ -78,9 +78,8 @@ bool PredFunction1(T1 v1) {
return
v1
>
0
;
}
// The following two functions are needed to circumvent a bug in
// gcc 2.95.3, which sometimes has problem with the above template
// function.
// The following two functions are needed because a compiler doesn't have
// a context yet to know which template function must be instantiated.
bool
PredFunction1Int
(
int
v1
)
{
return
v1
>
0
;
}
...
...
@@ -465,9 +464,8 @@ bool PredFunction2(T1 v1, T2 v2) {
return
v1
+
v2
>
0
;
}
// The following two functions are needed to circumvent a bug in
// gcc 2.95.3, which sometimes has problem with the above template
// function.
// The following two functions are needed because a compiler doesn't have
// a context yet to know which template function must be instantiated.
bool
PredFunction2Int
(
int
v1
,
int
v2
)
{
return
v1
+
v2
>
0
;
}
...
...
@@ -894,9 +892,8 @@ bool PredFunction3(T1 v1, T2 v2, T3 v3) {
return
v1
+
v2
+
v3
>
0
;
}
// The following two functions are needed to circumvent a bug in
// gcc 2.95.3, which sometimes has problem with the above template
// function.
// The following two functions are needed because a compiler doesn't have
// a context yet to know which template function must be instantiated.
bool
PredFunction3Int
(
int
v1
,
int
v2
,
int
v3
)
{
return
v1
+
v2
+
v3
>
0
;
}
...
...
@@ -1365,9 +1362,8 @@ bool PredFunction4(T1 v1, T2 v2, T3 v3, T4 v4) {
return
v1
+
v2
+
v3
+
v4
>
0
;
}
// The following two functions are needed to circumvent a bug in
// gcc 2.95.3, which sometimes has problem with the above template
// function.
// The following two functions are needed because a compiler doesn't have
// a context yet to know which template function must be instantiated.
bool
PredFunction4Int
(
int
v1
,
int
v2
,
int
v3
,
int
v4
)
{
return
v1
+
v2
+
v3
+
v4
>
0
;
}
...
...
@@ -1878,9 +1874,8 @@ bool PredFunction5(T1 v1, T2 v2, T3 v3, T4 v4, T5 v5) {
return
v1
+
v2
+
v3
+
v4
+
v5
>
0
;
}
// The following two functions are needed to circumvent a bug in
// gcc 2.95.3, which sometimes has problem with the above template
// function.
// The following two functions are needed because a compiler doesn't have
// a context yet to know which template function must be instantiated.
bool
PredFunction5Int
(
int
v1
,
int
v2
,
int
v3
,
int
v4
,
int
v5
)
{
return
v1
+
v2
+
v3
+
v4
+
v5
>
0
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment