Merge remote-tracking branch 'github/master'

[stg.git] / projects / stargazer / plugins / other / smux / utils.h

diff --git a/projects/stargazer/plugins/other/smux/utils.h b/projects/stargazer/plugins/other/smux/utils.h
index 7cfbdc78e9f579b5448f7b6297af77d97072c00b..66724e941de2e867a0a0b18e5b7834842a100862 100644 (file)
--- a/projects/stargazer/plugins/other/smux/utils.h
+++ b/projects/stargazer/plugins/other/smux/utils.h
@@ -1,23 +1,21 @@
-#ifndef __UTILS_H__
-#define __UTILS_H__
+#pragma once

 
 

-#include <string>
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
+#include "stg/OBJECT_IDENTIFIER.h"
+#include "stg/SMUX-PDUs.h"
+#include "stg/GetResponse-PDU.h"
+#pragma GCC diagnostic pop

 
 

-#include "asn1/OBJECT_IDENTIFIER.h"
-#include "SMUX-PDUs.h"
-#include "asn1/GetResponse-PDU.h"
+#include <string>

 
 

-bool WaitPackets(int sd);

 bool String2OI(const std::string & str, OBJECT_IDENTIFIER_t * oi);
 bool String2OI(const std::string & str, OBJECT_IDENTIFIER_t * oi);

-std::string OI2String(OBJECT_IDENTIFIER_t * oi);

 bool SendOpenPDU(int fd);
 bool SendOpenPDU(int fd);

-int SendClosePDU(int fd);
-int SendRReqPDU(int fd);
+bool SendClosePDU(int fd);
+bool SendRReqPDU(int fd);

 SMUX_PDUs_t * RecvSMUXPDUs(int fd);
 SMUX_PDUs_t * RecvSMUXPDUs(int fd);

-int SendGetResponsePDU(int fd, GetResponse_PDU_t * getResponse);
-int SendGetResponseErrorPDU(int fd,
-                            const PDU_t * getRequest,
-                            int errorStatus,
-                            int errorIndex);
-
-#endif
+bool SendGetResponsePDU(int fd, GetResponse_PDU_t * getResponse);
+bool SendGetResponseErrorPDU(int fd,
+                             const PDU_t * getRequest,
+                             int errorStatus,
+                             int errorIndex);