Skip to content

Commit 7000350

Browse files
authored
Disable warning 4710 for Windows builds (#186)
* Disable warning 4710 for Windows builds * Suppress compiler warnings for inline and padding Added pragma warning directives to suppress specific compiler warnings. * Fix pragma warning directive in kdbsolace.cpp * Suppress unused parameter warnings in callbacks * Handle unused parameters in K functions Added unused parameter handling in destroy_solace and version_solace functions. * Fix pragma warning disable syntax in kdbsolace.cpp
1 parent f86d70b commit 7000350

1 file changed

Lines changed: 12 additions & 0 deletions

File tree

src/kdbsolace.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
#ifdef _WIN32
33
#pragma comment(lib,"ws2_32.lib")
44
#pragma comment(lib,"q.lib")
5+
#pragma warning(disable: 4710) /* specified function was marked for inline expansion, but the compiler didn't inline the function */
6+
#pragma warning(disable: 4711) /* function selected for inline expansion */
7+
#pragma warning(disable: 4820) /* bytes padding added after construct 'member_name' */
58
#endif
69
#include "socketpair.c"
710
#include "solclient/solClient.h"
@@ -107,6 +110,7 @@ bool storePartialWrite(char* data, int dataSize, int numWritten)
107110

108111
static void socketWrittableCbFunc(solClient_opaqueContext_pt opaqueContext_p, solClient_fd_t fd, solClient_fdEvent_t events, void *user_p)
109112
{
113+
(void)user_p; /* unused callback param */
110114
if (!BLOCKED_PARTIAL_SEND_DATA.empty())
111115
{
112116
int numWritten = send(SPAIR[1], BLOCKED_PARTIAL_SEND_DATA.c_str(), BLOCKED_PARTIAL_SEND_DATA.size(), 0);
@@ -448,6 +452,8 @@ K kdbCallback(I d)
448452
/* The message receive callback function is mandatory for session creation. Gets called with msgs from direct subscriptions. */
449453
solClient_rxMsgCallback_returnCode_t defaultSubCallback ( solClient_opaqueSession_pt opaqueSession_p, solClient_opaqueMsg_pt msg_p, void *user_p )
450454
{
455+
(void)user_p; /* unused callback param */
456+
(void)opaqueSession_p; /* unused callback param */
451457
KdbSolaceEvent msgAndSource;
452458
msgAndSource._type = DIRECT_MSG_EVENT;
453459
msgAndSource._event._directMsg=msg_p;
@@ -458,6 +464,7 @@ solClient_rxMsgCallback_returnCode_t defaultSubCallback ( solClient_opaqueSessio
458464

459465
solClient_rxMsgCallback_returnCode_t guaranteedSubCallback ( solClient_opaqueFlow_pt opaqueFlow_p, solClient_opaqueMsg_pt msg_p, void *user_p )
460466
{
467+
(void)user_p; /* unused callback param */
461468
KdbSolaceEvent msgAndSource;
462469
msgAndSource._type = QUEUE_MSG_EVENT;
463470
msgAndSource._event._queueMsg._msg=msg_p;
@@ -469,6 +476,7 @@ solClient_rxMsgCallback_returnCode_t guaranteedSubCallback ( solClient_opaqueFlo
469476

470477
void flowEventCallback ( solClient_opaqueFlow_pt opaqueFlow_p, solClient_flow_eventCallbackInfo_pt eventInfo_p, void *user_p )
471478
{
479+
(void)user_p; /* unused callback param */
472480
int destinationType = -1;
473481
const char* destinationName = "";
474482
solClient_destination_t destination;
@@ -533,6 +541,8 @@ void flowEventCallback ( solClient_opaqueFlow_pt opaqueFlow_p, solClient_flow_ev
533541
*****************************************************************************/
534542
void eventCallback ( solClient_opaqueSession_pt opaqueSession_p, solClient_session_eventCallbackInfo_pt eventInfo_p, void *user_p )
535543
{
544+
(void)user_p; /* unused callback param */
545+
(void)opaqueSession_p; /* unused callback param */
536546
if (!KDB_SESSION_EVENT_CALLBACK_FUNC.empty())
537547
{
538548
// send details to kdb+
@@ -670,6 +680,7 @@ K init_solace(K options)
670680

671681
K destroy_solace(K a)
672682
{
683+
(void)a; /* unused parameter */
673684
solClient_returnCode_t retCode = SOLCLIENT_OK;
674685
if (session_p != NULL)
675686
{
@@ -694,6 +705,7 @@ K destroy_solace(K a)
694705

695706
K version_solace(K unused)
696707
{
708+
(void)unused; /* unused parameter */
697709
solClient_version_info_pt version = NULL;
698710
solClient_version_get (&version);
699711
K keys = knk(3,ks((char*)"solVersion"),ks((char*)"solDate"),ks((char*)"solVariant"));

0 commit comments

Comments
 (0)