Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enhance COM binding. #499

Merged
merged 4 commits into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Buffer/UniformBufferPool.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,9 @@ See LICENSE file in root folder

#include <ashespp/Buffer/StagingBuffer.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Cache/TargetCache.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ See LICENSE file in root folder
#include "Castor3D/Render/ToneMapping/ToneMappingModule.hpp"
#include "Castor3D/Render/PostEffect/PostEffectModule.hpp"

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Cache/TextureCache.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ See LICENSE file in root folder
#include "Castor3D/Material/Texture/TextureSourceInfo.hpp"
#include "Castor3D/Material/Texture/TextureUnit.hpp"

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#include <mutex>
#include <unordered_set>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Event/Frame/GpuFrameEvent.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ See LICENSE file in root folder

#include "FrameListener.hpp"

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Event/UserInput/EventHandler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ See LICENSE file in root folder

#include <deque>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ See LICENSE file in root folder

#include <CastorUtils/Graphics/RgbColour.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <unordered_set>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Material/Pass/Pass.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ See LICENSE file in root folder
#include <CastorUtils/Math/RangedValue.hpp>
#include <CastorUtils/Multithreading/SpinMutex.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#include <unordered_map>
#include <unordered_set>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Miscellaneous/LoadingScreen.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,9 @@ See LICENSE file in root folder

#include <ashespp/AshesPPPrerequisites.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Render/Node/SceneRenderNodes.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,9 @@ See LICENSE file in root folder

#include <ashespp/Buffer/Buffer.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Render/Passes/PickingPass.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,9 @@ See LICENSE file in root folder

#include <ashespp/Image/ImageView.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Render/Picking.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,9 @@ See LICENSE file in root folder

#include <CastorUtils/Design/OwnedBy.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Render/RenderLoopAsync.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,9 @@ See LICENSE file in root folder

#include "Castor3D/Render/RenderLoop.hpp"

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Render/RenderQueue.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ See LICENSE file in root folder
#include <CastorUtils/Design/GroupChangeTracked.hpp>
#include <CastorUtils/Multithreading/SpinMutex.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

#if defined( CU_CompilerMSVC )
# pragma warning( push )
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Render/RenderWindow.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@ See LICENSE file in root folder

#include <array>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Scene/Light/Light.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ See LICENSE file in root folder
#include <CastorUtils/Data/TextWriter.hpp>
#include <CastorUtils/Graphics/RgbColour.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Scene/Scene.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,9 @@ See LICENSE file in root folder

#include <RenderGraph/FramePassTimer.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Shader/ShaderBuffers/LightBuffer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,9 @@ See LICENSE file in root folder

#include <ashespp/Descriptor/DescriptorSet.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
5 changes: 2 additions & 3 deletions include/Core/Castor3D/Shader/ShaderBuffers/PassBuffer.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@ See LICENSE file in root folder

#include <ashespp/Descriptor/DescriptorSet.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,9 @@ See LICENSE file in root folder

#include <ashespp/Descriptor/DescriptorSet.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,10 @@ See LICENSE file in root folder

#include <CastorUtils/Design/ArrayView.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <atomic>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ See LICENSE file in root folder

#include <CastorUtils/Design/ArrayView.hpp>

#pragma warning( push )
#pragma warning( disable:4365 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <mutex>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor3d
{
Expand Down
9 changes: 2 additions & 7 deletions include/Core/CastorUtils/CastorUtils.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,7 @@ See LICENSE file in root folder

#include "CastorUtils/Config/ConfigModule.hpp"

#pragma warning( push )
#pragma warning( disable:4365 )
#pragma warning( disable:5262 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <array>
#include <cassert>
#include <chrono>
Expand All @@ -28,7 +26,7 @@ See LICENSE file in root folder
#include <deque>
#include <sstream>
#include <vector>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

namespace castor
{
Expand All @@ -49,9 +47,6 @@ namespace castor
CU_DeclareVector( uint32_t, UInt32 );
}

#pragma warning( push )
#pragma warning( disable:5262 )
#include "CastorUtils/Miscellaneous/Debug.hpp"
#pragma warning( pop )

#endif
64 changes: 64 additions & 0 deletions include/Core/CastorUtils/Config/BeginExternHeaderGuard.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
/*
See LICENSE file in root folder
*/
#pragma warning( push )
#pragma warning( disable: 4100 )
#pragma warning( disable: 4127 )
#pragma warning( disable: 4189 )
#pragma warning( disable: 4201 )
#pragma warning( disable: 4242 )
#pragma warning( disable: 4244 )
#pragma warning( disable: 4245 )
#pragma warning( disable: 4251 )
#pragma warning( disable: 4275 )
#pragma warning( disable: 4296 )
#pragma warning( disable: 4365 )
#pragma warning( disable: 4371 )
#pragma warning( disable: 4456 )
#pragma warning( disable: 4458 )
#pragma warning( disable: 4464 )
#pragma warning( disable: 4616 )
#pragma warning( disable: 4619 )
#pragma warning( disable: 4996 )
#pragma warning( disable: 5031 )
#pragma warning( disable: 5054 )
#pragma warning( disable: 5214 )
#pragma warning( disable: 5219 )
#pragma warning( disable: 5262 )

#pragma clang diagnostic push
#pragma clang diagnostic ignored "-Wambiguous-reversed-operator"
#pragma clang diagnostic ignored "-Watomic-implicit-seq-cst"
#pragma clang diagnostic ignored "-Wcast-align"
#pragma clang diagnostic ignored "-Wcast-function-type"
#pragma clang diagnostic ignored "-Wcomma"
#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-copy"
#pragma clang diagnostic ignored "-Wdeprecated-copy-with-user-provided-dtor"
#pragma clang diagnostic ignored "-Wdisabled-macro-expansion"
#pragma clang diagnostic ignored "-Wimplicit-fallthrough"
#pragma clang diagnostic ignored "-Wimplicit-int-float-conversion"
#pragma clang diagnostic ignored "-Winfinite-recursion"
#pragma clang diagnostic ignored "-Wmissing-prototypes"
#pragma clang diagnostic ignored "-Wmissing-variable-declarations"
#pragma clang diagnostic ignored "-Wreserved-identifier"

#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Walloc-zero"
#pragma GCC diagnostic ignored "-Wcast-qual"
#pragma GCC diagnostic ignored "-Wconversion"
#pragma GCC diagnostic ignored "-Wdeprecated-copy"
#pragma GCC diagnostic ignored "-Wdeprecated-enum-enum-conversion"
#pragma GCC diagnostic ignored "-Wduplicate-enum"
#pragma GCC diagnostic ignored "-Wfloat-conversion"
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
#pragma GCC diagnostic ignored "-Wmissing-declarations"
#pragma GCC diagnostic ignored "-Wnull-dereference"
#pragma GCC diagnostic ignored "-Wold-style-cast"
#pragma GCC diagnostic ignored "-Wredundant-decls"
#pragma GCC diagnostic ignored "-Wshadow"
#pragma GCC diagnostic ignored "-Wshift-negative-value"
#pragma GCC diagnostic ignored "-Wsuggest-destructor-override"
#pragma GCC diagnostic ignored "-Wsuggest-override"
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
#pragma GCC diagnostic ignored "-Wuseless-cast"
#pragma GCC diagnostic ignored "-Wzero-as-null-pointer-constant"
6 changes: 2 additions & 4 deletions include/Core/CastorUtils/Config/ConfigModule.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ See LICENSE file in root folder
#include "CastorUtils/Config/PlatformConfig.hpp"
#include "CastorUtils/Config/SmartPtr.hpp"

#pragma warning( push )
#pragma warning( disable:4365 )
#pragma warning( disable:5262 )
#include <CastorUtils/Config/BeginExternHeaderGuard.hpp>
#include <chrono>
#include <string>
#include <string_view>
#include <iostream>
#include <sstream>
#pragma warning( pop )
#include <CastorUtils/Config/EndExternHeaderGuard.hpp>

/**@name Configuration */
//@{
Expand Down
6 changes: 6 additions & 0 deletions include/Core/CastorUtils/Config/EndExternHeaderGuard.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/*
See LICENSE file in root folder
*/
#pragma GCC diagnostic pop
#pragma clang diagnostic pop
#pragma warning( pop )
Loading