Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
googletest
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Thierry Schuepbach
googletest
Commits
49ecebd1
Unverified
Commit
49ecebd1
authored
May 21, 2018
by
James Dennett
Committed by
GitHub
May 21, 2018
Browse files
Options
Downloads
Patches
Plain Diff
Downgrade to C++98.
Some projects cannot handle C++11 yet.
parent
ec2c911b
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
googletest/include/gtest/internal/gtest-type-util.h.pump
+6
-6
6 additions, 6 deletions
googletest/include/gtest/internal/gtest-type-util.h.pump
with
6 additions
and
6 deletions
googletest/include/gtest/internal/gtest-type-util.h.pump
+
6
−
6
View file @
49ecebd1
...
...
@@ -60,12 +60,12 @@ namespace internal {
// used by various standard libraries (e.g., `std::__1`). Names outside
// of namespace std are returned unmodified.
inline
std
::
string
CanonicalizeForStdLibVersioning
(
std
::
string
s
)
{
static
const
expr
char
prefix
[]
=
"std::__"
;
static
const
char
prefix
[]
=
"std::__"
;
if
(
s
.
compare
(
0
,
strlen
(
prefix
),
prefix
)
==
0
)
{
auto
end
=
s
.
find
(
"::"
,
strlen
(
prefix
));
std
::
string
::
size_type
end
=
s
.
find
(
"::"
,
strlen
(
prefix
));
if
(
end
!=
s
.
npos
)
{
// Erase
the `::__` plus whatever was between that
and the
next
`::`.
s
.
erase
(
strlen
(
"std"
),
strlen
(
"::__"
)
+
end
-
strlen
(
prefix
));
// Erase
everything between the initial `std`
and the
second
`::`.
s
.
erase
(
strlen
(
"std"
),
end
-
strlen
(
"std"
));
}
}
return
s
;
...
...
@@ -87,9 +87,9 @@ std::string GetTypeName() {
using
abi
::
__cxa_demangle
;
# endif // GTEST_HAS_CXXABI_H_
char
*
const
readable_name
=
__cxa_demangle
(
name
,
0
,
0
,
&
status
);
std
::
string
name_str
(
status
==
0
?
readable_name
:
name
);
const
std
::
string
name_str
(
status
==
0
?
readable_name
:
name
);
free
(
readable_name
);
return
CanonicalizeForStdLibVersioning
(
std
::
move
(
name_str
)
)
;
return
CanonicalizeForStdLibVersioning
(
name_str
);
# else
return
name
;
# endif // GTEST_HAS_CXXABI_H_ || __HP_aCC
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment