2
0
mirror of https://github.com/Laupetin/OpenAssetTools.git synced 2026-02-10 17:43:03 +00:00

fix: clang compilation issues

This commit is contained in:
Jan Laupetin
2026-01-27 19:04:58 +01:00
parent c602170fb3
commit 38038f8fad
5 changed files with 8 additions and 8 deletions

View File

@@ -15,9 +15,9 @@ public:
DispatchableThread(); DispatchableThread();
~DispatchableThread(); ~DispatchableThread();
DispatchableThread(const DispatchableThread& other) = delete; DispatchableThread(const DispatchableThread& other) = delete;
DispatchableThread(DispatchableThread&& other) noexcept = default; DispatchableThread(DispatchableThread&& other) noexcept = delete;
DispatchableThread& operator=(const DispatchableThread& other) = delete; DispatchableThread& operator=(const DispatchableThread& other) = delete;
DispatchableThread& operator=(DispatchableThread&& other) noexcept = default; DispatchableThread& operator=(DispatchableThread&& other) noexcept = delete;
void Start(); void Start();
void Terminate(); void Terminate();

View File

@@ -134,10 +134,10 @@ int main(int argc, const char** argv)
ModManArgs args; ModManArgs args;
auto shouldContinue = true; auto shouldContinue = true;
if (!args.ParseArgs(MODMAN_ARGC, MODMAN_ARGV, shouldContinue)) if (!args.ParseArgs(MODMAN_ARGC, MODMAN_ARGV, shouldContinue))
return false; return 1;
if (!shouldContinue) if (!shouldContinue)
return true; return 0;
con::info("Starting ModMan " GIT_VERSION); con::info("Starting ModMan " GIT_VERSION);

View File

@@ -1334,7 +1334,7 @@ namespace
public: public:
MaterialLoader(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt) MaterialLoader(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt)
: m_memory(memory), : m_memory(memory),
m_search_path(m_search_path), m_search_path(searchPath),
m_gdt(gdt) m_gdt(gdt)
{ {
} }

View File

@@ -1,7 +1,7 @@
#pragma once #pragma once
#include <cstdlib> #include <cstdlib>
#include <nlohmann/json_fwd.hpp> #include <nlohmann/json.hpp>
namespace gltf namespace gltf
{ {

View File

@@ -13,8 +13,8 @@ public:
virtual ~ContentWriterBase() = default; virtual ~ContentWriterBase() = default;
ContentWriterBase(const ContentWriterBase& other) = default; ContentWriterBase(const ContentWriterBase& other) = default;
ContentWriterBase(ContentWriterBase&& other) noexcept = default; ContentWriterBase(ContentWriterBase&& other) noexcept = default;
ContentWriterBase& operator=(const ContentWriterBase& other) = default; ContentWriterBase& operator=(const ContentWriterBase& other) = delete;
ContentWriterBase& operator=(ContentWriterBase&& other) noexcept = default; ContentWriterBase& operator=(ContentWriterBase&& other) noexcept = delete;
protected: protected:
void WriteXString(bool atStreamStart); void WriteXString(bool atStreamStart);