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
ff37e416
Commit
ff37e416
authored
May 29, 2021
by
Victor Zverovich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wchar.h -> xchar.h because it handles other code unit types too
parent
0901176f
Changes
7
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
14 additions
and
17 deletions
+14
-17
CMakeLists.txt
CMakeLists.txt
+1
-1
include/fmt/format.h
include/fmt/format.h
+2
-2
include/fmt/locale.h
include/fmt/locale.h
+2
-2
include/fmt/xchar.h
include/fmt/xchar.h
+1
-1
src/fmt.cc
src/fmt.cc
+6
-8
test/enforce-checks-test.cc
test/enforce-checks-test.cc
+1
-1
test/wchar-test.cc
test/wchar-test.cc
+1
-2
No files found.
CMakeLists.txt
View file @
ff37e416
...
@@ -227,7 +227,7 @@ endfunction()
...
@@ -227,7 +227,7 @@ endfunction()
# Define the fmt library, its includes and the needed defines.
# Define the fmt library, its includes and the needed defines.
add_headers
(
FMT_HEADERS args.h chrono.h color.h compile.h core.h format.h
add_headers
(
FMT_HEADERS args.h chrono.h color.h compile.h core.h format.h
format-inl.h locale.h os.h ostream.h printf.h ranges.h
format-inl.h locale.h os.h ostream.h printf.h ranges.h
w
char.h
)
x
char.h
)
if
(
FMT_MODULE
)
if
(
FMT_MODULE
)
set
(
FMT_SOURCES src/fmt.cc
)
set
(
FMT_SOURCES src/fmt.cc
)
elseif
(
FMT_OS
)
elseif
(
FMT_OS
)
...
...
include/fmt/format.h
View file @
ff37e416
...
@@ -2889,8 +2889,8 @@ inline auto formatted_size(const S& fmt, Args&&... args) -> size_t {
...
@@ -2889,8 +2889,8 @@ inline auto formatted_size(const S& fmt, Args&&... args) -> size_t {
FMT_MODULE_EXPORT_END
FMT_MODULE_EXPORT_END
FMT_END_NAMESPACE
FMT_END_NAMESPACE
#ifdef FMT_DEPRECATED_INCLUDE_
W
CHAR
#ifdef FMT_DEPRECATED_INCLUDE_
X
CHAR
# include "
w
char.h"
# include "
x
char.h"
#endif
#endif
#ifdef FMT_HEADER_ONLY
#ifdef FMT_HEADER_ONLY
...
...
include/fmt/locale.h
View file @
ff37e416
#include "
w
char.h"
#include "
x
char.h"
#warning fmt/locale.h is deprecated, include fmt/format.h or fmt/
w
char.h instead
#warning fmt/locale.h is deprecated, include fmt/format.h or fmt/
x
char.h instead
include/fmt/
w
char.h
→
include/fmt/
x
char.h
View file @
ff37e416
// Formatting library for C++ - optional wchar_t support
// Formatting library for C++ - optional wchar_t
and exotic character
support
//
//
// Copyright (c) 2012 - present, Victor Zverovich
// Copyright (c) 2012 - present, Victor Zverovich
// All rights reserved.
// All rights reserved.
...
...
src/fmt.cc
View file @
ff37e416
...
@@ -8,8 +8,10 @@ module;
...
@@ -8,8 +8,10 @@ module;
# define WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN
#endif
#endif
#include <algorithm>
#include <cctype>
#include <cctype>
#include <cerrno>
#include <cerrno>
#include <chrono>
#include <climits>
#include <climits>
#include <clocale>
#include <clocale>
#include <cmath>
#include <cmath>
...
@@ -21,9 +23,6 @@ module;
...
@@ -21,9 +23,6 @@ module;
#include <cstring>
#include <cstring>
#include <ctime>
#include <ctime>
#include <cwchar>
#include <cwchar>
#include <algorithm>
#include <chrono>
#include <exception>
#include <exception>
#include <functional>
#include <functional>
#include <iterator>
#include <iterator>
...
@@ -76,17 +75,16 @@ export module fmt;
...
@@ -76,17 +75,16 @@ export module fmt;
#define FMT_END_DETAIL_NAMESPACE \
#define FMT_END_DETAIL_NAMESPACE \
} \
} \
export {
export {
// all library-provided declarations and definitions
// all library-provided declarations and definitions
// must be in the module purview to be exported
// must be in the module purview to be exported
#include "fmt/format.h"
#include "fmt/args.h"
#include "fmt/args.h"
#include "fmt/chrono.h"
#include "fmt/color.h"
#include "fmt/color.h"
#include "fmt/compile.h"
#include "fmt/compile.h"
#include "fmt/chrono.h"
#include "fmt/format.h"
#include "fmt/printf.h"
#include "fmt/wchar.h"
#include "fmt/os.h"
#include "fmt/os.h"
#include "fmt/printf.h"
#include "fmt/xchar.h"
module
:
private
;
module
:
private
;
...
...
test/enforce-checks-test.cc
View file @
ff37e416
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
#include "fmt/format.h"
#include "fmt/format.h"
#include "fmt/ostream.h"
#include "fmt/ostream.h"
#include "fmt/ranges.h"
#include "fmt/ranges.h"
#include "fmt/
w
char.h"
#include "fmt/
x
char.h"
// Exercise the API to verify that everything we expect to can compile.
// Exercise the API to verify that everything we expect to can compile.
void
test_format_api
()
{
void
test_format_api
()
{
...
...
test/wchar-test.cc
View file @
ff37e416
...
@@ -5,10 +5,9 @@
...
@@ -5,10 +5,9 @@
//
//
// For the license information refer to format.h.
// For the license information refer to format.h.
#include "fmt/wchar.h"
#include <complex>
#include <complex>
#include "fmt/xchar.h"
#include "gtest/gtest.h"
#include "gtest/gtest.h"
using
fmt
::
detail
::
max_value
;
using
fmt
::
detail
::
max_value
;
...
...
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