kram - update STL_NAMESPACE define

alecazam · Sep 24, 2024 · 8e74fdf · 8e74fdf
1 parent 1809117
commit 8e74fdf
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/kramv/KramViewerBase.cpp b/kramv/KramViewerBase.cpp
@@ -1605,9 +1605,9 @@ void Data::loadFilesFromUrls(vector<string>& urls, bool skipSubdirs)
 
     // sort them by short filename
 #if USE_EASTL
-    NAMESPACE_STL::quick_sort(_files.begin(), _files.end());
+    STL_NAMESPACE::quick_sort(_files.begin(), _files.end());
 #else
-    std::sort(_files.begin(), _files.end());
+    STL_NAMESPACE::sort(_files.begin(), _files.end());
 #endif
 
     // preserve filename before load, and restore that index, by finding

diff --git a/libkram/bc7enc/utils.cpp b/libkram/bc7enc/utils.cpp
@@ -10,7 +10,7 @@
 
 namespace utils 
 {		
-using namespace NAMESPACE_STL;
+using namespace STL_NAMESPACE;
 
 #define FLOOD_PUSH(y, xl, xr, dy) if (((y + (dy)) >= 0) && ((y + (dy)) < (int)m_height)) { stack.push_back(fill_segment(y, xl, xr, dy)); }
 

diff --git a/libkram/kram/KramLog.cpp b/libkram/kram/KramLog.cpp
@@ -1055,7 +1055,7 @@ int32_t logMessage(const char* group, int32_t logLevel,
 // to have full source to impl to fix things in fmt.
 // https://fmt.dev/latest/api.html#_CPPv4IDpEN3fmt14formatted_sizeE6size_t13format_stringIDp1TEDpRR1T
 
-// TODO: can this use NAMESPACE_STL::string_view instead ?
+// TODO: can this use STL_NAMESPACE::string_view instead ?
 int32_t logMessage(const char* group, int32_t logLevel,
                           const char* file, int32_t line, const char* func,
                           fmt::string_view format, fmt::format_args args)

diff --git a/libkram/transcoder/basisu_transcoder.cpp b/libkram/transcoder/basisu_transcoder.cpp
@@ -185,7 +185,7 @@ namespace basisu
 
 namespace basist
 {
-    using namespace NAMESPACE_STL;
+    using namespace STL_NAMESPACE;
 
 #if BASISD_ENABLE_DEBUG_FLAGS
 	static uint32_t g_debug_flags = 0;

diff --git a/libkram/transcoder/basisu_transcoder.h b/libkram/transcoder/basisu_transcoder.h
@@ -42,7 +42,7 @@
 
 namespace basist
 {
-    using namespace NAMESPACE_STL;
+    using namespace STL_NAMESPACE;
 
 	// High-level composite texture formats supported by the transcoder.
 	// Each of these texture formats directly correspond to OpenGL/D3D/Vulkan etc. texture formats.