-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Revert "Revert "Merge pull request xbmc#18403 from lrusak/cpp17""
This reverts commit bd6818f. This also includes a fix for the following: CLog: fix SPDLOG_LEVEL_NAMES to allow compiling Otherwise the following error occurs: xbmc/utils/log.h:12:89: error: ‘constexpr fmt::v8::basic_string_view<Char>::basic_string_view(const Char*) [with Char = char]’ called in a constant expression 12 | #define SPDLOG_LEVEL_NAMES {"TRACE", "DEBUG", "INFO", "WARNING", "ERROR", "FATAL", "OFF"}; | ^ In file included from /usr/include/fmt/format.h:44, from xbmc/utils/StringUtils.h:37, from xbmc/utils/log.h:19, /usr/include/fmt/core.h:460:3: note: ‘constexpr fmt::v8::basic_string_view<Char>::basic_string_view(const Char*) [with Char = char]’ is not usable as a ‘constexpr’ function because: 460 | basic_string_view(const Char* s) : data_(s) { | ^~~~~~~~~~~~~~~~~ /usr/include/fmt/core.h:460:3: error: member ‘fmt::v8::basic_string_view<char>::size_’ must be initialized by mem-initializer in ‘constexpr’ constructor /usr/include/fmt/core.h:439:10: note: declared here 439 | size_t size_; | ^~~~~
- Loading branch information
Showing
16 changed files
with
1,010 additions
and
171 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,7 +1,5 @@ | ||
# Languages and global compiler settings | ||
if(NOT DEFINED CMAKE_CXX_STANDARD OR CMAKE_CXX_STANDARD LESS 14) | ||
set(CMAKE_CXX_STANDARD 14) | ||
endif() | ||
set(CMAKE_CXX_STANDARD 17) | ||
set(CMAKE_CXX_STANDARD_REQUIRED ON) | ||
set(CMAKE_CXX_EXTENSIONS OFF) | ||
set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp") |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.