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:
@@ -15,9 +15,9 @@ public:
|
||||
DispatchableThread();
|
||||
~DispatchableThread();
|
||||
DispatchableThread(const DispatchableThread& other) = delete;
|
||||
DispatchableThread(DispatchableThread&& other) noexcept = default;
|
||||
DispatchableThread(DispatchableThread&& other) noexcept = delete;
|
||||
DispatchableThread& operator=(const DispatchableThread& other) = delete;
|
||||
DispatchableThread& operator=(DispatchableThread&& other) noexcept = default;
|
||||
DispatchableThread& operator=(DispatchableThread&& other) noexcept = delete;
|
||||
|
||||
void Start();
|
||||
void Terminate();
|
||||
|
||||
@@ -134,10 +134,10 @@ int main(int argc, const char** argv)
|
||||
ModManArgs args;
|
||||
auto shouldContinue = true;
|
||||
if (!args.ParseArgs(MODMAN_ARGC, MODMAN_ARGV, shouldContinue))
|
||||
return false;
|
||||
return 1;
|
||||
|
||||
if (!shouldContinue)
|
||||
return true;
|
||||
return 0;
|
||||
|
||||
con::info("Starting ModMan " GIT_VERSION);
|
||||
|
||||
|
||||
@@ -1334,7 +1334,7 @@ namespace
|
||||
public:
|
||||
MaterialLoader(MemoryManager& memory, ISearchPath& searchPath, IGdtQueryable& gdt)
|
||||
: m_memory(memory),
|
||||
m_search_path(m_search_path),
|
||||
m_search_path(searchPath),
|
||||
m_gdt(gdt)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#pragma once
|
||||
|
||||
#include <cstdlib>
|
||||
#include <nlohmann/json_fwd.hpp>
|
||||
#include <nlohmann/json.hpp>
|
||||
|
||||
namespace gltf
|
||||
{
|
||||
|
||||
@@ -13,8 +13,8 @@ public:
|
||||
virtual ~ContentWriterBase() = default;
|
||||
ContentWriterBase(const ContentWriterBase& other) = default;
|
||||
ContentWriterBase(ContentWriterBase&& other) noexcept = default;
|
||||
ContentWriterBase& operator=(const ContentWriterBase& other) = default;
|
||||
ContentWriterBase& operator=(ContentWriterBase&& other) noexcept = default;
|
||||
ContentWriterBase& operator=(const ContentWriterBase& other) = delete;
|
||||
ContentWriterBase& operator=(ContentWriterBase&& other) noexcept = delete;
|
||||
|
||||
protected:
|
||||
void WriteXString(bool atStreamStart);
|
||||
|
||||
Reference in New Issue
Block a user