BodgeMaster
/
NORM-mirror
mirror of https://github.com/USNavalResearchLaboratory/norm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Linux/gcc tweak for normSocket code

pull/9/head
Brian Adamson 2020-04-29 23:07:53 -04:00
parent 88e600cedb
commit 2c34e3bf26
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
examples/normSocket.h
View File

@ -114,7 +114,9 @@ typedef enum NormSocketEventType
NORM_SOCKET_CLOSING, // indicates remote endpoint is closing socket (only read data at this point) NORM_SOCKET_CLOSING, // indicates remote endpoint is closing socket (only read data at this point)
NORM_SOCKET_CLOSE // indicates socket is now closed (invalid for further operations) NORM_SOCKET_CLOSE // indicates socket is now closed (invalid for further operations)
} NormSocketEventType; } NormSocketEventType;
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wpedantic"
typedef struct typedef struct
{ {
NormSocketEventType type; NormSocketEventType type;
@ -134,6 +136,7 @@ typedef struct
}; };
}; };
} NormSocketEvent; } NormSocketEvent;
#pragma GCC diagnostic pop
bool NormGetSocketEvent(NormInstanceHandle normInstance, NormSocketEvent* event, bool waitForEvent = true); bool NormGetSocketEvent(NormInstanceHandle normInstance, NormSocketEvent* event, bool waitForEvent = true);

2
include/normSession.h
View File

@ -59,7 +59,7 @@ class NormController
SEND_ERROR, SEND_ERROR,
USER_TIMEOUT, USER_TIMEOUT,
// The ones below here are not exposed via the NORM API // The ones below here are not exposed via the NORM API
SEND_OK, SEND_OK
}; };
virtual void Notify(NormController::Event event, virtual void Notify(NormController::Event event,