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
dac9a7f9
Commit
dac9a7f9
authored
Dec 22, 2019
by
Victor Zverovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve UTF-8 handling on Windows
parent
3ca9533f
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
25 additions
and
9 deletions
+25
-9
include/fmt/core.h
include/fmt/core.h
+7
-0
include/fmt/format-inl.h
include/fmt/format-inl.h
+18
-9
No files found.
include/fmt/core.h
View file @
dac9a7f9
...
...
@@ -208,6 +208,13 @@
# define FMT_USE_EXPERIMENTAL_STRING_VIEW
#endif
#ifndef FMT_UNICODE
# define FMT_UNICODE 0
#endif
#if FMT_UNICODE
# pragma execution_character_set("utf-8")
#endif
FMT_BEGIN_NAMESPACE
// Implementations of enable_if_t and other metafunctions for pre-C++14 systems.
...
...
include/fmt/format-inl.h
View file @
dac9a7f9
...
...
@@ -21,6 +21,11 @@
# include <locale>
#endif
#if FMT_UNICODE
#include <windows.h>
#include <io.h>
#endif
#ifdef _MSC_VER
# pragma warning(push)
# pragma warning(disable : 4702) // unreachable code
...
...
@@ -1336,20 +1341,24 @@ FMT_FUNC void report_system_error(int error_code,
report_error
(
format_system_error
,
error_code
,
message
);
}
#ifndef FMT_UNICODE
# define FMT_UNICODE 0
#endif
FMT_FUNC
void
vprint
(
std
::
FILE
*
f
,
string_view
format_str
,
format_args
args
)
{
memory_buffer
buffer
;
internal
::
vformat_to
(
buffer
,
format_str
,
basic_format_args
<
buffer_context
<
char
>>
(
args
));
#if FMT_UNICODE
internal
::
utf8_to_utf16
u16
(
string_view
(
buffer
.
data
(),
buffer
.
size
()));
std
::
fputws
(
u16
.
c_str
(),
f
);
#else
internal
::
fwrite_fully
(
buffer
.
data
(),
1
,
buffer
.
size
(),
f
);
#if defined(_WIN32) && FMT_UNICODE
auto
fd
=
_fileno
(
f
);
if
(
_isatty
(
fd
))
{
internal
::
utf8_to_utf16
u16
(
string_view
(
buffer
.
data
(),
buffer
.
size
()));
auto
written
=
DWORD
();
if
(
!
WriteConsoleW
(
reinterpret_cast
<
HANDLE
>
(
_get_osfhandle
(
fd
)),
u16
.
c_str
(),
u16
.
size
(),
&
written
,
nullptr
))
{
throw
format_error
(
"failed to write to console"
);
}
return
;
}
#endif
internal
::
fwrite_fully
(
buffer
.
data
(),
1
,
buffer
.
size
(),
f
);
}
FMT_FUNC
void
vprint
(
string_view
format_str
,
format_args
args
)
{
...
...
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