Skip to content

feat: bump language version to C++23 #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zao wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: bump language version to C++23 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.15)
project(SimpleGraphic C CXX)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_CXX_STANDARD 17)
set(CMAKE_CXX_STANDARD 23)

if (APPLE)
enable_language(OBJCXX)
Expand Down
6 changes: 4 additions & 2 deletions engine/core/core_config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ bool core_config_c::LoadConfig(std::filesystem::path const& cfgName)
auto fileName = cfgName;
fileName.replace_extension(".cfg");

sys->con->Print(fmt::format("Executing {}\n", fileName.generic_u8string()).c_str());
const auto fileNameU8 = fileName.generic_u8string();
sys->con->Print(fmt::format("Executing {}\n", std::string_view((const char*)fileNameU8.data(), fileNameU8.size())).c_str());

// Read the config file
fileInputStream_c f;
Expand Down Expand Up @@ -203,7 +204,8 @@ bool core_config_c::SaveConfig(std::filesystem::path const& cfgName)
auto fileName = cfgName;
fileName.replace_extension(".cfg");

sys->con->Print(fmt::format("Saving {}\n", fileName.generic_u8string()).c_str());
const auto fileNameU8 = fileName.generic_u8string();
sys->con->Print(fmt::format("Saving {}\n", std::string_view((const char*)fileNameU8.data(), fileNameU8.size())).c_str());

// Open the config file
fileOutputStream_c f;
Expand Down
5 changes: 3 additions & 2 deletions engine/render/r_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,7 +816,7 @@ void r_renderer_c::Init(r_featureFlag_e features)
glShaderSource(fs, 1, &fragSourcePtr, nullptr);
}
catch (std::exception& e) {
sys->Error(u8"Failed to format fragment shader:\n%s", e.what());
sys->Error("Failed to format fragment shader:\n%s", e.what());
}
glCompileShader(fs);
if (!GetShaderCompileSuccess(fs)) {
Expand Down Expand Up @@ -1770,7 +1770,8 @@ void r_renderer_c::DoScreenshot(image_c* i, int type, const char* ext)
sys->con->Print("Couldn't write screenshot!\n");
return;
}
sys->con->Print(fmt::format("Wrote screenshot to {}\n", ssPath.generic_u8string()).c_str());
const auto ssPathU8 = ssPath.generic_u8string();
sys->con->Print(fmt::format("Wrote screenshot to {}\n", std::string_view((const char*)ssPathU8.data(), ssPathU8.size())).c_str());
}

r_renderer_c::RenderTarget& r_renderer_c::GetDrawRenderTarget()
Expand Down
8 changes: 4 additions & 4 deletions engine/system/win/sys_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,14 @@ std::optional<std::string> BuildGlobPattern(std::filesystem::path const& glob)
{
using namespace std::literals::string_view_literals;
auto globStr = glob.generic_u8string();
auto globView = std::string_view(globStr);
auto globView = std::string_view((const char*)globStr.data(), globStr.size());

// Deal with traditional "everything" wildcards.
if (globView == "*" || globView == "*.*") {
return {};
}

auto u32Str = IndexUTF8ToUTF32(globStr);
auto u32Str = IndexUTF8ToUTF32(globView);
auto& offsets = u32Str.sourceCodeUnitOffsets;

fmt::memory_buffer buf;
Expand Down Expand Up @@ -200,8 +200,8 @@ bool GlobMatch(std::optional<std::string> const& globPattern, std::filesystem::p
reOpts.set_case_sensitive(false);
RE2 reGlob{globPattern.value(), reOpts};

auto fileStr = file.generic_u8string();
return RE2::FullMatch(fileStr, reGlob);
auto fileU8 = file.generic_u8string();
return RE2::FullMatch(std::string_view((const char*)fileU8.data(), fileU8.size()), reGlob);
}

bool find_c::FindFirst(std::filesystem::path const&& fileSpec)
Expand Down
1 change: 1 addition & 0 deletions engine/system/win/sys_video.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ bool ShouldIgnoreDpiScale() {
struct ScopedRegKey {
HKEY key{};

ScopedRegKey() = default;
ScopedRegKey& operator = (ScopedRegKey const&) = delete;
ScopedRegKey(ScopedRegKey const&) = delete;
~ScopedRegKey() {
Expand Down
17 changes: 9 additions & 8 deletions ui_api.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,8 @@ SG_LUA_CPP_FUN_BEGIN(imgHandleLoad)
}
}
// TODO(LV): should we use u8path throughout here, to support any callers that use paths outside of working directory?
imgHandle->hnd = ui->renderer->RegisterShader(fileName.generic_u8string(), flags);
auto shaderName = fileName.generic_u8string();
imgHandle->hnd = ui->renderer->RegisterShader(std::string_view((const char*)shaderName.data(), shaderName.size()), flags);
return 0;
}
SG_LUA_CPP_FUN_END()
Expand Down Expand Up @@ -1351,7 +1352,7 @@ static int l_searchHandleGetFileName(lua_State* L)
{
ui_main_c* ui = GetUIPtr(L);
searchHandle_s* searchHandle = GetSearchHandle(L, ui, "GetFileName", true);
lua_pushstring(L, searchHandle->find->fileName.generic_u8string().c_str());
lua_pushstring(L, (const char*)searchHandle->find->fileName.generic_u8string().c_str());
return 1;
}

Expand Down Expand Up @@ -1655,7 +1656,7 @@ static int l_GetTime(lua_State* L)
static int l_GetScriptPath(lua_State* L)
{
ui_main_c* ui = GetUIPtr(L);
lua_pushstring(L, ui->scriptPath.generic_u8string().c_str());
lua_pushstring(L, (const char*)ui->scriptPath.generic_u8string().c_str());
try
{
lua_pushstring(L, ui->scriptPath.generic_string().c_str());
Expand All @@ -1672,7 +1673,7 @@ static int l_GetScriptPath(lua_State* L)
static int l_GetRuntimePath(lua_State* L)
{
ui_main_c* ui = GetUIPtr(L);
lua_pushstring(L, ui->sys->basePath.generic_u8string().c_str());
lua_pushstring(L, (const char*)ui->sys->basePath.generic_u8string().c_str());
try
{
lua_pushstring(L, ui->sys->basePath.generic_string().c_str());
Expand Down Expand Up @@ -1701,7 +1702,7 @@ static int l_GetUserPath(lua_State* L)
return 2;
}

lua_pushstring(L, userPath->generic_u8string().c_str());
lua_pushstring(L, (const char*)userPath->generic_u8string().c_str());
try
{
lua_pushstring(L, userPath->generic_string().c_str());
Expand Down Expand Up @@ -1781,7 +1782,7 @@ SG_LUA_CPP_FUN_END()
static int l_GetWorkDir(lua_State* L)
{
ui_main_c* ui = GetUIPtr(L);
lua_pushstring(L, ui->scriptWorkDir.generic_u8string().c_str());
lua_pushstring(L, (const char*)ui->scriptWorkDir.generic_u8string().c_str());
return 1;
}

Expand Down Expand Up @@ -1862,7 +1863,7 @@ SG_LUA_CPP_FUN_BEGIN(LoadModule)

ui->sys->SetWorkDir(ui->scriptPath);
auto fileStr = fileName.generic_u8string();
int err = luaL_loadfile(L, fileStr.c_str());
int err = luaL_loadfile(L, (const char*)fileStr.c_str());
ui->sys->SetWorkDir(ui->scriptWorkDir);
ui->LExpect(L, err == 0, "LoadModule() error loading '%s' (%d):\n%s", fileStr.c_str(), err, lua_tostring(L, -1));
lua_replace(L, 1); // Replace module name with module main chunk
Expand All @@ -1884,7 +1885,7 @@ SG_LUA_CPP_FUN_BEGIN(PLoadModule)
}

ui->sys->SetWorkDir(ui->scriptPath);
int err = luaL_loadfile(L, fileName.generic_u8string().c_str());
int err = luaL_loadfile(L, (const char*)fileName.generic_u8string().c_str());
ui->sys->SetWorkDir(ui->scriptWorkDir);
if (err) {
return 1;
Expand Down
6 changes: 3 additions & 3 deletions ui_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ void ui_main_c::DoError(const char* msg, const char* error)
{
auto scriptStr = scriptName.generic_u8string();
char* errText = AllocStringLen(strlen(msg) + scriptStr.size() + strlen(error) + 30);
sprintf(errText, "--- SCRIPT ERROR ---\n%s '%s':\n%s\n", msg, scriptStr.c_str(), error);
sprintf(errText, "--- SCRIPT ERROR ---\n%s '%s':\n%s\n", msg, (const char*)scriptStr.c_str(), error);
sys->Exit(errText);
FreeString(errText);
didExit = true;
Expand Down Expand Up @@ -286,7 +286,7 @@ void ui_main_c::ScriptInit()
if (!scriptPath.empty()) {
sys->con->Printf("Script working directory: %s\n", scriptWorkDir.generic_u8string().c_str());
}
sys->video->SetTitle(scriptName.generic_u8string().c_str());
sys->video->SetTitle((const char*)scriptName.generic_u8string().c_str());

restartFlag = false;
didExit = false;
Expand Down Expand Up @@ -329,7 +329,7 @@ void ui_main_c::ScriptInit()

// Load the script file
sys->SetWorkDir(scriptWorkDir);
err = luaL_loadfile(L, scriptName.filename().generic_u8string().c_str());
err = luaL_loadfile(L, (const char*)scriptName.filename().generic_u8string().c_str());
if (err) {
DoError("Error loading", lua_tostring(L, -1));
return;
Expand Down
Loading