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
aa07c576
Commit
aa07c576
authored
Jan 04, 2020
by
Victor Zverovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Move vprint_mojibake to the internal namespace
parent
a73d89e9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
include/fmt/core.h
include/fmt/core.h
+8
-5
include/fmt/format-inl.h
include/fmt/format-inl.h
+4
-4
No files found.
include/fmt/core.h
View file @
aa07c576
...
@@ -1441,6 +1441,8 @@ template <typename Char>
...
@@ -1441,6 +1441,8 @@ template <typename Char>
typename
buffer_context
<
Char
>::
iterator
vformat_to
(
typename
buffer_context
<
Char
>::
iterator
vformat_to
(
buffer
<
Char
>&
buf
,
basic_string_view
<
Char
>
format_str
,
buffer
<
Char
>&
buf
,
basic_string_view
<
Char
>
format_str
,
basic_format_args
<
buffer_context
<
Char
>>
args
);
basic_format_args
<
buffer_context
<
Char
>>
args
);
FMT_API
void
vprint_mojibake
(
std
::
FILE
*
,
string_view
,
format_args
);
}
// namespace internal
}
// namespace internal
/**
/**
...
@@ -1515,7 +1517,6 @@ inline std::basic_string<Char> format(const S& format_str, Args&&... args) {
...
@@ -1515,7 +1517,6 @@ inline std::basic_string<Char> format(const S& format_str, Args&&... args) {
FMT_API
void
vprint
(
string_view
,
format_args
);
FMT_API
void
vprint
(
string_view
,
format_args
);
FMT_API
void
vprint
(
std
::
FILE
*
,
string_view
,
format_args
);
FMT_API
void
vprint
(
std
::
FILE
*
,
string_view
,
format_args
);
FMT_API
void
vprint_mojibake
(
std
::
FILE
*
,
string_view
,
format_args
);
/**
/**
\rst
\rst
...
@@ -1535,8 +1536,9 @@ inline void print(std::FILE* f, const S& format_str, Args&&... args) {
...
@@ -1535,8 +1536,9 @@ inline void print(std::FILE* f, const S& format_str, Args&&... args) {
vprint
(
f
,
to_string_view
(
format_str
),
vprint
(
f
,
to_string_view
(
format_str
),
internal
::
make_args_checked
<
Args
...
>
(
format_str
,
args
...));
internal
::
make_args_checked
<
Args
...
>
(
format_str
,
args
...));
#else
#else
vprint_mojibake
(
f
,
to_string_view
(
format_str
),
internal
::
vprint_mojibake
(
internal
::
make_args_checked
<
Args
...
>
(
format_str
,
args
...));
f
,
to_string_view
(
format_str
),
internal
::
make_args_checked
<
Args
...
>
(
format_str
,
args
...));
#endif
#endif
}
}
...
@@ -1558,8 +1560,9 @@ inline void print(const S& format_str, Args&&... args) {
...
@@ -1558,8 +1560,9 @@ inline void print(const S& format_str, Args&&... args) {
vprint
(
to_string_view
(
format_str
),
vprint
(
to_string_view
(
format_str
),
internal
::
make_args_checked
<
Args
...
>
(
format_str
,
args
...));
internal
::
make_args_checked
<
Args
...
>
(
format_str
,
args
...));
#else
#else
vprint_mojibake
(
stdout
,
to_string_view
(
format_str
),
internal
::
vprint_mojibake
(
internal
::
make_args_checked
<
Args
...
>
(
format_str
,
args
...));
stdout
,
to_string_view
(
format_str
),
internal
::
make_args_checked
<
Args
...
>
(
format_str
,
args
...));
#endif
#endif
}
}
FMT_END_NAMESPACE
FMT_END_NAMESPACE
...
...
include/fmt/format-inl.h
View file @
aa07c576
...
@@ -1363,12 +1363,12 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
...
@@ -1363,12 +1363,12 @@ FMT_FUNC void vprint(std::FILE* f, string_view format_str, format_args args) {
#ifdef _WIN32
#ifdef _WIN32
// Print assuming legacy (non-Unicode) encoding.
// Print assuming legacy (non-Unicode) encoding.
FMT_FUNC
void
vprint_mojibake
(
std
::
FILE
*
f
,
string_view
format_str
,
FMT_FUNC
void
internal
::
vprint_mojibake
(
std
::
FILE
*
f
,
string_view
format_str
,
format_args
args
)
{
format_args
args
)
{
memory_buffer
buffer
;
memory_buffer
buffer
;
internal
::
vformat_to
(
buffer
,
format_str
,
vformat_to
(
buffer
,
format_str
,
basic_format_args
<
buffer_context
<
char
>>
(
args
));
basic_format_args
<
buffer_context
<
char
>>
(
args
));
internal
::
fwrite_fully
(
buffer
.
data
(),
1
,
buffer
.
size
(),
f
);
fwrite_fully
(
buffer
.
data
(),
1
,
buffer
.
size
(),
f
);
}
}
#endif
#endif
...
...
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