Skip to content

Commit d66e5c9

Browse files
author
pradeep
committed
Fix compiler diagnositc pragmas and FGDLL definition scope
1 parent 6ee3343 commit d66e5c9

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

include/ComputeCopy.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,9 @@ void copyToGLBuffer(GfxHandle* pGLDestination, ComputeResourceHandle pSource, c
181181
#if defined(__GNUC__)
182182
#pragma GCC diagnostic push
183183
#pragma GCC diagnostic ignored "-Wunused-but-set-variable"
184+
#elif defined(__clang__)
185+
#pragma clang diagnostic push
186+
#pragma clang diagnostic ignored "-Wunused-but-set-variable"
184187
#endif
185188

186189
#define FORGE_OCL_CHECK(cl_status, message) \

src/backend/common/cmap.hpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,12 @@ namespace common
1818
#if defined(OS_WIN)
1919
#pragma warning( push )
2020
#pragma warning( disable : 4305)
21-
#else
21+
#elif defined(__GNUC__)
2222
#pragma GCC diagnostic push
23-
#pragma GCC diagnostic ignored "-Wformat-truncation"
23+
#pragma GCC diagnostic ignored "-Wconversion"
24+
#elif defined(__clang__)
25+
#pragma clang diagnostic push
26+
#pragma clang diagnostic ignored "-Wconversion"
2427
#endif
2528

2629
/**
@@ -2945,8 +2948,10 @@ static const float cmap_viridis[] =
29452948

29462949
#if defined(OS_WIN)
29472950
#pragma warning( pop ) // re-enable truncation warning
2948-
#else
2951+
#elif defined(__GNUC__)
29492952
#pragma GCC diagnostic pop
2953+
#elif defined(__clang__)
2954+
#pragma clang diagnostic pop
29502955
#endif
29512956

29522957
}

src/backend/opengl/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ set_target_properties(${BackendTarget} PROPERTIES SOVERSION ${Forge_VERSION_MAJO
1313

1414
if (WIN32)
1515
target_compile_definitions(${BackendTarget}
16-
PUBLIC FGDLL
17-
PRIVATE OS_WIN WIN32_MEAN_AND_LEAN)
16+
PRIVATE FGDLL OS_WIN WIN32_MEAN_AND_LEAN)
1817

1918
# C4068: Warnings about unknown pragmas
2019
# C4275: Warnings about using non-exported classes as base class of an

0 commit comments

Comments
 (0)