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
a59678f3
Commit
a59678f3
authored
Jun 10, 2021
by
Владислав Щапов
Committed by
Victor Zverovich
Jun 14, 2021
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix chrono_test.locale
UTF-8:
https://datatracker.ietf.org/doc/html/rfc3629
parent
c98254c3
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
28 additions
and
3 deletions
+28
-3
include/fmt/chrono.h
include/fmt/chrono.h
+28
-3
No files found.
include/fmt/chrono.h
View file @
a59678f3
...
@@ -298,8 +298,16 @@ inline auto do_write(const std::tm& time, const std::locale& loc, char format,
...
@@ -298,8 +298,16 @@ inline auto do_write(const std::tm& time, const std::locale& loc, char format,
if
(
end
.
failed
())
FMT_THROW
(
format_error
(
"failed to format time"
));
if
(
end
.
failed
())
FMT_THROW
(
format_error
(
"failed to format time"
));
auto
str
=
os
.
str
();
auto
str
=
os
.
str
();
if
(
!
detail
::
is_utf8
()
||
loc
==
std
::
locale
::
classic
())
return
str
;
if
(
!
detail
::
is_utf8
()
||
loc
==
std
::
locale
::
classic
())
return
str
;
// char16_t and char32_t codecvts are broken in MSVC (linkage errors).
// char16_t and char32_t codecvts are broken in MSVC (linkage errors) and
using
code_unit
=
conditional_t
<
FMT_MSC_VER
!=
0
,
wchar_t
,
char16_t
>
;
// gcc-4.
#if FMT_MSC_VER != 0 || \
(defined(__GLIBCXX__) && !defined(_GLIBCXX_USE_DUAL_ABI))
// The _GLIBCXX_USE_DUAL_ABI macro is always defined in libstdc++ from gcc-5
// and newer.
using
code_unit
=
wchar_t
;
#else
using
code_unit
=
char32_t
;
#endif
auto
&
f
=
std
::
use_facet
<
std
::
codecvt
<
code_unit
,
char
,
std
::
mbstate_t
>>
(
loc
);
auto
&
f
=
std
::
use_facet
<
std
::
codecvt
<
code_unit
,
char
,
std
::
mbstate_t
>>
(
loc
);
auto
mb
=
std
::
mbstate_t
();
auto
mb
=
std
::
mbstate_t
();
const
char
*
from_next
=
nullptr
;
const
char
*
from_next
=
nullptr
;
...
@@ -312,12 +320,29 @@ inline auto do_write(const std::tm& time, const std::locale& loc, char format,
...
@@ -312,12 +320,29 @@ inline auto do_write(const std::tm& time, const std::locale& loc, char format,
FMT_THROW
(
format_error
(
"failed to format time"
));
FMT_THROW
(
format_error
(
"failed to format time"
));
str
.
clear
();
str
.
clear
();
for
(
code_unit
*
p
=
buf
;
p
!=
to_next
;
++
p
)
{
for
(
code_unit
*
p
=
buf
;
p
!=
to_next
;
++
p
)
{
auto
c
=
*
p
;
uint32_t
c
=
static_cast
<
uint32_t
>
(
*
p
);
if
(
sizeof
(
code_unit
)
==
2
&&
c
>=
0xd800
&&
c
<=
0xdfff
)
{
// surrogate pair
++
p
;
if
(
p
==
to_next
||
(
c
&
0xfc00
)
!=
0xd800
||
(
*
p
&
0xfc00
)
!=
0xdc00
)
{
FMT_THROW
(
format_error
(
"failed to format time"
));
}
c
=
(
c
<<
10
)
+
static_cast
<
uint32_t
>
(
*
p
)
-
0x35fdc00
;
}
if
(
c
<
0x80
)
{
if
(
c
<
0x80
)
{
str
.
push_back
(
static_cast
<
char
>
(
c
));
str
.
push_back
(
static_cast
<
char
>
(
c
));
}
else
if
(
c
<
0x800
)
{
}
else
if
(
c
<
0x800
)
{
str
.
push_back
(
static_cast
<
char
>
(
0xc0
|
(
c
>>
6
)));
str
.
push_back
(
static_cast
<
char
>
(
0xc0
|
(
c
>>
6
)));
str
.
push_back
(
static_cast
<
char
>
(
0x80
|
(
c
&
0x3f
)));
str
.
push_back
(
static_cast
<
char
>
(
0x80
|
(
c
&
0x3f
)));
}
else
if
((
c
>=
0x800
&&
c
<=
0xd7ff
)
||
(
c
>=
0xe000
&&
c
<=
0xffff
))
{
str
.
push_back
(
static_cast
<
char
>
(
0xe0
|
(
c
>>
12
)));
str
.
push_back
(
static_cast
<
char
>
(
0x80
|
((
c
&
0xfff
)
>>
6
)));
str
.
push_back
(
static_cast
<
char
>
(
0x80
|
(
c
&
0x3f
)));
}
else
if
(
c
>=
0x10000
&&
c
<=
0x10ffff
)
{
str
.
push_back
(
static_cast
<
char
>
(
0xf0
|
(
c
>>
18
)));
str
.
push_back
(
static_cast
<
char
>
(
0x80
|
((
c
&
0x3ffff
)
>>
12
)));
str
.
push_back
(
static_cast
<
char
>
(
0x80
|
((
c
&
0xfff
)
>>
6
)));
str
.
push_back
(
static_cast
<
char
>
(
0x80
|
(
c
&
0x3f
)));
}
else
{
}
else
{
FMT_THROW
(
format_error
(
"failed to format time"
));
FMT_THROW
(
format_error
(
"failed to format time"
));
}
}
...
...
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