mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1940 from tsuoranta/fix-gcc9

Browse Source 
Fix for GCC 9 / Werror=deprecated-copy
This commit is contained in:
John Kessenich 2020-01-27 01:02:08 -07:00 committed by GitHub
commit d5f2f7b93d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -101,6 +101,9 @@ if(${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
-Wunused-parameter -Wunused-value -Wunused-variable -Wunused-but-set-parameter -Wunused-but-set-variable -fno-exceptions) -Wunused-parameter -Wunused-value -Wunused-variable -Wunused-but-set-parameter -Wunused-but-set-variable -fno-exceptions)
add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over. add_compile_options(-Wno-reorder) # disable this from -Wall, since it happens all over.
add_compile_options(-fno-rtti) add_compile_options(-fno-rtti)
if(CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "9.0.0")
add_compile_options(-Werror=deprecated-copy)
endif()
elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang") elseif(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
add_compile_options(-Wall -Wuninitialized -Wunused -Wunused-local-typedefs add_compile_options(-Wall -Wuninitialized -Wunused -Wunused-local-typedefs
-Wunused-parameter -Wunused-value -Wunused-variable) -Wunused-parameter -Wunused-value -Wunused-variable)

2
SPIRV/SpvBuilder.h
View File

@ -512,7 +512,7 @@ public:
Block &head, &body, &merge, &continue_target; Block &head, &body, &merge, &continue_target;
private: private:
LoopBlocks(); LoopBlocks();
LoopBlocks& operator=(const LoopBlocks&); LoopBlocks& operator=(const LoopBlocks&) = delete;
}; };
// Start a new loop and prepare the builder to generate code for it. Until // Start a new loop and prepare the builder to generate code for it. Until

2
glslang/Include/ConstantUnion.h
View File

@ -921,7 +921,7 @@ public:
else else
unionArray = new TConstUnionVector(size); unionArray = new TConstUnionVector(size);
} }
TConstUnionArray(const TConstUnionArray& a) : unionArray(a.unionArray) { } TConstUnionArray(const TConstUnionArray& a) = default;
TConstUnionArray(const TConstUnionArray& a, int start, int size) TConstUnionArray(const TConstUnionArray& a, int start, int size)
{ {
unionArray = new TConstUnionVector(size); unionArray = new TConstUnionVector(size);

12
glslang/MachineIndependent/iomapper.cpp
View File

@ -161,7 +161,7 @@ struct TNotifyUniformAdaptor
} }
private: private:
TNotifyUniformAdaptor& operator=(TNotifyUniformAdaptor&); TNotifyUniformAdaptor& operator=(TNotifyUniformAdaptor&) = delete;
}; };
struct TNotifyInOutAdaptor struct TNotifyInOutAdaptor
@ -180,7 +180,7 @@ struct TNotifyInOutAdaptor
} }
private: private:
TNotifyInOutAdaptor& operator=(TNotifyInOutAdaptor&); TNotifyInOutAdaptor& operator=(TNotifyInOutAdaptor&) = delete;
}; };
struct TResolverUniformAdaptor { struct TResolverUniformAdaptor {
@ -236,7 +236,7 @@ struct TResolverUniformAdaptor {
bool& error; bool& error;
private: private:
TResolverUniformAdaptor& operator=(TResolverUniformAdaptor&); TResolverUniformAdaptor& operator=(TResolverUniformAdaptor&) = delete;
}; };
struct TResolverInOutAdaptor { struct TResolverInOutAdaptor {
@ -283,7 +283,7 @@ struct TResolverInOutAdaptor {
bool& error; bool& error;
private: private:
TResolverInOutAdaptor& operator=(TResolverInOutAdaptor&); TResolverInOutAdaptor& operator=(TResolverInOutAdaptor&) = delete;
}; };
// The class is used for reserving explicit uniform locations and ubo/ssbo/opaque bindings // The class is used for reserving explicit uniform locations and ubo/ssbo/opaque bindings
@ -384,7 +384,7 @@ struct TSymbolValidater
bool& hadError; bool& hadError;
private: private:
TSymbolValidater& operator=(TSymbolValidater&); TSymbolValidater& operator=(TSymbolValidater&) = delete;
}; };
struct TSlotCollector { struct TSlotCollector {
@ -398,7 +398,7 @@ struct TSlotCollector {
TInfoSink& infoSink; TInfoSink& infoSink;
private: private:
TSlotCollector& operator=(TSlotCollector&); TSlotCollector& operator=(TSlotCollector&) = delete;
}; };
TDefaultIoResolverBase::TDefaultIoResolverBase(const TIntermediate& intermediate) TDefaultIoResolverBase::TDefaultIoResolverBase(const TIntermediate& intermediate)