Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fmt
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Libraries
fmt
Commits
81d56638
Commit
81d56638
authored
Jun 03, 2018
by
Victor Zverovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix more bogus MSVC warnings about unreachable code (#748)
parent
68f0ac82
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
10 deletions
+6
-10
include/fmt/core.h
include/fmt/core.h
+2
-2
include/fmt/format.h
include/fmt/format.h
+4
-8
No files found.
include/fmt/core.h
View file @
81d56638
...
...
@@ -740,8 +740,8 @@ class basic_parse_context : private ErrorHandler {
FMT_CONSTEXPR
bool
check_arg_id
(
unsigned
)
{
if
(
next_arg_id_
>
0
)
{
on_error
(
"cannot switch from automatic to manual argument indexing"
);
return
false
;
return
on_error
(
"cannot switch from automatic to manual argument indexing"
),
false
;
}
next_arg_id_
=
-
1
;
return
true
;
...
...
include/fmt/format.h
View file @
81d56638
...
...
@@ -1322,8 +1322,7 @@ template <typename Char, typename ErrorHandler>
FMT_CONSTEXPR
unsigned
basic_parse_context
<
Char
,
ErrorHandler
>::
next_arg_id
()
{
if
(
next_arg_id_
>=
0
)
return
internal
::
to_unsigned
(
next_arg_id_
++
);
on_error
(
"cannot switch from manual to automatic argument indexing"
);
return
0
;
return
on_error
(
"cannot switch from manual to automatic argument indexing"
),
0
;
}
struct
format_string
{};
...
...
@@ -1703,8 +1702,7 @@ class width_checker: public function<unsigned long long> {
template
<
typename
T
>
FMT_CONSTEXPR
typename
std
::
enable_if
<
!
is_integer
<
T
>::
value
,
unsigned
long
long
>::
type
operator
()(
T
)
{
handler_
.
on_error
(
"width is not integer"
);
return
0
;
return
handler_
.
on_error
(
"width is not integer"
),
0
;
}
private:
...
...
@@ -2058,10 +2056,8 @@ FMT_CONSTEXPR Iterator parse_format_specs(Iterator it, SpecHandler &&handler) {
}
if
(
align
!=
ALIGN_DEFAULT
)
{
if
(
p
!=
it
)
{
if
(
c
==
'{'
)
{
handler
.
on_error
(
"invalid fill character '{'"
);
return
it
;
}
if
(
c
==
'{'
)
return
handler
.
on_error
(
"invalid fill character '{'"
),
it
;
it
+=
2
;
handler
.
on_fill
(
c
);
}
else
++
it
;
...
...
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