mirrors/SFML
1
0
Fork 0
mirror of https://github.com/SFML/SFML.git synced 2024-11-28 22:31:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use std:: namespace

Browse Source
This commit is contained in:
Chris Thrasher 2023-12-31 14:37:24 -07:00
parent 115344ecc3
commit be5c52a1fc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/SFML/Window/Unix/Display.cpp
View File

@ -36,6 +36,7 @@
#include <unordered_map> #include <unordered_map>
#include <cassert> #include <cassert>
#include <clocale>
#include <cstdlib> #include <cstdlib>
@ -104,11 +105,11 @@ XIM openXim()
// the IM and properly receiving text // the IM and properly receiving text
// First save the previous ones (this might be able to be written more elegantly?) // First save the previous ones (this might be able to be written more elegantly?)
const char* p; const char* p;
const std::string prevLoc((p = setlocale(LC_ALL, nullptr)) ? p : ""); const std::string prevLoc((p = std::setlocale(LC_ALL, nullptr)) ? p : "");
const std::string prevXLoc((p = XSetLocaleModifiers(nullptr)) ? p : ""); const std::string prevXLoc((p = XSetLocaleModifiers(nullptr)) ? p : "");
// Set the locales from environment // Set the locales from environment
setlocale(LC_ALL, ""); std::setlocale(LC_ALL, "");
XSetLocaleModifiers(""); XSetLocaleModifiers("");
// Create the input context // Create the input context
@ -116,7 +117,7 @@ XIM openXim()
// Restore the previous locale // Restore the previous locale
if (prevLoc.length() != 0) if (prevLoc.length() != 0)
setlocale(LC_ALL, prevLoc.c_str()); std::setlocale(LC_ALL, prevLoc.c_str());
if (prevXLoc.length() != 0) if (prevXLoc.length() != 0)
XSetLocaleModifiers(prevXLoc.c_str()); XSetLocaleModifiers(prevXLoc.c_str());