From 30fb71d8eb348f70f1dcd6021ab41c475a19583c Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Tue, 23 Apr 2019 00:12:31 +0200 Subject: [PATCH] nodes: convert C-style header files to C++ style headers --- include/villas/nodes/{amqp.h => amqp.hpp} | 8 -------- include/villas/nodes/{comedi.h => comedi.hpp} | 8 -------- include/villas/nodes/{file.h => file.hpp} | 8 -------- .../villas/nodes/{iec61850.h => iec61850.hpp} | 8 -------- .../nodes/{iec61850_sv.h => iec61850_sv.hpp} | 10 +--------- .../nodes/{infiniband.h => infiniband.hpp} | 0 .../villas/nodes/{influxdb.h => influxdb.hpp} | 8 -------- .../villas/nodes/{loopback.h => loopback.hpp} | 8 -------- include/villas/nodes/{mqtt.h => mqtt.hpp} | 8 -------- .../villas/nodes/{nanomsg.h => nanomsg.hpp} | 8 -------- include/villas/nodes/{ngsi.h => ngsi.hpp} | 8 -------- include/villas/nodes/{opal.h => opal.hpp} | 8 -------- include/villas/nodes/rtp.hpp | 13 +++++------- include/villas/nodes/{shmem.h => shmem.hpp} | 8 -------- ...ignal_generator.h => signal_generator.hpp} | 8 -------- include/villas/nodes/{socket.h => socket.hpp} | 8 -------- include/villas/nodes/stats.hpp | 8 -------- .../villas/nodes/{test_rtt.h => test_rtt.hpp} | 8 -------- include/villas/nodes/{uldaq.h => uldaq.hpp} | 8 -------- .../nodes/{websocket.h => websocket.hpp} | 8 -------- include/villas/nodes/{zeromq.h => zeromq.hpp} | 8 -------- lib/kernel/if.cpp | 2 +- lib/memory/ib.cpp | 2 +- lib/nodes/amqp.cpp | 2 +- lib/nodes/comedi.cpp | 2 +- lib/nodes/file.cpp | 2 +- lib/nodes/iec61850.cpp | 2 +- lib/nodes/iec61850_sv.cpp | 2 +- lib/nodes/infiniband.cpp | 2 +- lib/nodes/influxdb.cpp | 2 +- lib/nodes/loopback.cpp | 2 +- lib/nodes/mqtt.cpp | 2 +- lib/nodes/nanomsg.cpp | 2 +- lib/nodes/ngsi.cpp | 2 +- lib/nodes/opal.cpp | 2 +- lib/nodes/rtp.cpp | 20 +++++++++---------- lib/nodes/shmem.cpp | 2 +- lib/nodes/signal_generator.cpp | 2 +- lib/nodes/socket.cpp | 2 +- lib/nodes/test_rtt.cpp | 2 +- lib/nodes/uldaq.cpp | 2 +- lib/nodes/websocket.cpp | 2 +- lib/nodes/zeromq.cpp | 2 +- lib/web.cpp | 2 +- src/villas-node.cpp | 2 +- src/villas-pipe.cpp | 2 +- src/villas-signal.cpp | 2 +- 47 files changed, 41 insertions(+), 196 deletions(-) rename include/villas/nodes/{amqp.h => amqp.hpp} (96%) rename include/villas/nodes/{comedi.h => comedi.hpp} (97%) rename include/villas/nodes/{file.h => file.hpp} (97%) rename include/villas/nodes/{iec61850.h => iec61850.hpp} (97%) rename include/villas/nodes/{iec61850_sv.h => iec61850_sv.hpp} (96%) rename include/villas/nodes/{infiniband.h => infiniband.hpp} (100%) rename include/villas/nodes/{influxdb.h => influxdb.hpp} (96%) rename include/villas/nodes/{loopback.h => loopback.hpp} (96%) rename include/villas/nodes/{mqtt.h => mqtt.hpp} (97%) rename include/villas/nodes/{nanomsg.h => nanomsg.hpp} (96%) rename include/villas/nodes/{ngsi.h => ngsi.hpp} (97%) rename include/villas/nodes/{opal.h => opal.hpp} (97%) rename include/villas/nodes/{shmem.h => shmem.hpp} (96%) rename include/villas/nodes/{signal_generator.h => signal_generator.hpp} (97%) rename include/villas/nodes/{socket.h => socket.hpp} (97%) rename include/villas/nodes/{test_rtt.h => test_rtt.hpp} (97%) rename include/villas/nodes/{uldaq.h => uldaq.hpp} (96%) rename include/villas/nodes/{websocket.h => websocket.hpp} (97%) rename include/villas/nodes/{zeromq.h => zeromq.hpp} (97%) diff --git a/include/villas/nodes/amqp.h b/include/villas/nodes/amqp.hpp similarity index 96% rename from include/villas/nodes/amqp.h rename to include/villas/nodes/amqp.hpp index 93a9df15e..74b8a7c6b 100644 --- a/include/villas/nodes/amqp.h +++ b/include/villas/nodes/amqp.hpp @@ -35,10 +35,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct format_type; @@ -85,8 +81,4 @@ int amqp_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel /** @see node_type::write */ int amqp_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/comedi.h b/include/villas/nodes/comedi.hpp similarity index 97% rename from include/villas/nodes/comedi.h rename to include/villas/nodes/comedi.hpp index c852b91d4..ba13435e7 100644 --- a/include/villas/nodes/comedi.h +++ b/include/villas/nodes/comedi.hpp @@ -35,10 +35,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - // whether to use read() or mmap() kernel interface #define COMEDI_USE_READ (1) //#define COMEDI_USE_READ (0) @@ -103,7 +99,3 @@ int comedi_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *r int comedi_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/nodes/file.h b/include/villas/nodes/file.hpp similarity index 97% rename from include/villas/nodes/file.h rename to include/villas/nodes/file.hpp index cc753661e..3e80798c5 100644 --- a/include/villas/nodes/file.h +++ b/include/villas/nodes/file.hpp @@ -33,10 +33,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - #define FILE_MAX_PATHLEN 512 struct file { @@ -91,7 +87,3 @@ int file_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel int file_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/nodes/iec61850.h b/include/villas/nodes/iec61850.hpp similarity index 97% rename from include/villas/nodes/iec61850.h rename to include/villas/nodes/iec61850.hpp index a6ff7b14e..6c6259065 100644 --- a/include/villas/nodes/iec61850.h +++ b/include/villas/nodes/iec61850.hpp @@ -45,10 +45,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - enum iec61850_type { /* According to IEC 61850-7-2 */ BOOLEAN, @@ -120,8 +116,4 @@ int iec61850_receiver_stop(struct iec61850_receiver *r); int iec61850_receiver_destroy(struct iec61850_receiver *r); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/iec61850_sv.h b/include/villas/nodes/iec61850_sv.hpp similarity index 96% rename from include/villas/nodes/iec61850_sv.h rename to include/villas/nodes/iec61850_sv.hpp index e354af730..fe47df111 100644 --- a/include/villas/nodes/iec61850_sv.h +++ b/include/villas/nodes/iec61850_sv.hpp @@ -38,11 +38,7 @@ #include #include #include -#include - -#ifdef __cplusplus -extern "C" { -#endif +#include struct iec61850_sv { char *interface; @@ -108,8 +104,4 @@ int iec61850_sv_write(struct node *n, struct sample *smps[], unsigned cnt, unsig /** @see node_type::fd */ int iec61850_sv_fd(struct node *n); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/infiniband.h b/include/villas/nodes/infiniband.hpp similarity index 100% rename from include/villas/nodes/infiniband.h rename to include/villas/nodes/infiniband.hpp diff --git a/include/villas/nodes/influxdb.h b/include/villas/nodes/influxdb.hpp similarity index 96% rename from include/villas/nodes/influxdb.h rename to include/villas/nodes/influxdb.hpp index 9b1aafae6..0494de032 100644 --- a/include/villas/nodes/influxdb.h +++ b/include/villas/nodes/influxdb.hpp @@ -31,10 +31,6 @@ #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct node; struct sample; @@ -67,8 +63,4 @@ int influxdb_close(struct node *n); /** @see node_type::write */ int influxdb_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/loopback.h b/include/villas/nodes/loopback.hpp similarity index 96% rename from include/villas/nodes/loopback.h rename to include/villas/nodes/loopback.hpp index 782b721c7..abed0a331 100644 --- a/include/villas/nodes/loopback.h +++ b/include/villas/nodes/loopback.hpp @@ -32,10 +32,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct node; struct sample; @@ -68,8 +64,4 @@ int loopback_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned /** @see node_type::write */ int loopback_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/mqtt.h b/include/villas/nodes/mqtt.hpp similarity index 97% rename from include/villas/nodes/mqtt.h rename to include/villas/nodes/mqtt.hpp index 2ef92753b..6114a9f2d 100644 --- a/include/villas/nodes/mqtt.h +++ b/include/villas/nodes/mqtt.hpp @@ -34,10 +34,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct format_type; struct mosquitto; @@ -100,8 +96,4 @@ int mqtt_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel /** @see node_type::write */ int mqtt_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/nanomsg.h b/include/villas/nodes/nanomsg.hpp similarity index 96% rename from include/villas/nodes/nanomsg.h rename to include/villas/nodes/nanomsg.hpp index 037fcdc99..a7c2e3bc0 100644 --- a/include/villas/nodes/nanomsg.h +++ b/include/villas/nodes/nanomsg.hpp @@ -33,10 +33,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /** The maximum length of a packet which contains stuct msg. */ #define NANOMSG_MAX_PACKET_LEN 1500 @@ -71,8 +67,4 @@ int nanomsg_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned * /** @see node_type::write */ int nanomsg_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/ngsi.h b/include/villas/nodes/ngsi.hpp similarity index 97% rename from include/villas/nodes/ngsi.h rename to include/villas/nodes/ngsi.hpp index 8cdc3d851..885932e1f 100644 --- a/include/villas/nodes/ngsi.h +++ b/include/villas/nodes/ngsi.hpp @@ -42,10 +42,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct node; @@ -99,7 +95,3 @@ int ngsi_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rel int ngsi_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/nodes/opal.h b/include/villas/nodes/opal.hpp similarity index 97% rename from include/villas/nodes/opal.h rename to include/villas/nodes/opal.hpp index ae7cbcd97..8744eafdf 100644 --- a/include/villas/nodes/opal.h +++ b/include/villas/nodes/opal.hpp @@ -41,10 +41,6 @@ #include "AsyncApi.h" #include "OpalGenAsyncParamCtrl.h" -#ifdef __cplusplus -extern "C" { -#endif - struct opal { int reply; int mode; @@ -89,8 +85,4 @@ int opal_read(struct node *n, struct sample *smps[], unsigned cnt); /** @see node_type::write */ int opal_write(struct node *n, struct sample *smps[], unsigned cnt); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/rtp.hpp b/include/villas/nodes/rtp.hpp index cc7ced139..00227e73b 100644 --- a/include/villas/nodes/rtp.hpp +++ b/include/villas/nodes/rtp.hpp @@ -34,10 +34,6 @@ #include -extern "C" { -#include -} - #include #include #include @@ -47,6 +43,11 @@ extern "C" { #include #include +extern "C" { + #include + #include +} + /* Forward declarations */ struct format_type; @@ -104,8 +105,6 @@ struct rtp { struct mbuf *send_mb; }; -extern "C" { - /** @see node_type::print */ char * rtp_print(struct node *n); @@ -124,6 +123,4 @@ int rtp_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *rele /** @see node_type::write */ int rtp_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); -} - /** @} */ diff --git a/include/villas/nodes/shmem.h b/include/villas/nodes/shmem.hpp similarity index 96% rename from include/villas/nodes/shmem.h rename to include/villas/nodes/shmem.hpp index b418898a7..60833b2a9 100644 --- a/include/villas/nodes/shmem.h +++ b/include/villas/nodes/shmem.hpp @@ -36,10 +36,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /** Node-type for shared memory communication. * @see node_type */ @@ -70,7 +66,3 @@ int shmem_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *re int shmem_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/nodes/signal_generator.h b/include/villas/nodes/signal_generator.hpp similarity index 97% rename from include/villas/nodes/signal_generator.h rename to include/villas/nodes/signal_generator.hpp index f924f2035..0ccfa144b 100644 --- a/include/villas/nodes/signal_generator.h +++ b/include/villas/nodes/signal_generator.hpp @@ -32,10 +32,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct node; struct sample; @@ -92,7 +88,3 @@ int signal_generator_stop(struct node *n); int signal_generator_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/nodes/socket.h b/include/villas/nodes/socket.hpp similarity index 97% rename from include/villas/nodes/socket.h rename to include/villas/nodes/socket.hpp index 995d4dd6c..207098d45 100644 --- a/include/villas/nodes/socket.h +++ b/include/villas/nodes/socket.hpp @@ -34,10 +34,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct format_type; @@ -94,7 +90,3 @@ int socket_parse(struct node *n, json_t *cfg); char * socket_print(struct node *n); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/nodes/stats.hpp b/include/villas/nodes/stats.hpp index b4574d6b9..e15dba9c8 100644 --- a/include/villas/nodes/stats.hpp +++ b/include/villas/nodes/stats.hpp @@ -35,10 +35,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct node; struct sample; @@ -80,8 +76,4 @@ int stats_node_stop(struct node *n); /** @see node_type::read */ int stats_node_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/test_rtt.h b/include/villas/nodes/test_rtt.hpp similarity index 97% rename from include/villas/nodes/test_rtt.h rename to include/villas/nodes/test_rtt.hpp index 541dde2fa..6004eb6fc 100644 --- a/include/villas/nodes/test_rtt.h +++ b/include/villas/nodes/test_rtt.hpp @@ -33,10 +33,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - /* Forward declarations */ struct test_rtt; struct node; @@ -86,7 +82,3 @@ int test_rtt_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned int test_rtt_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/nodes/uldaq.h b/include/villas/nodes/uldaq.hpp similarity index 96% rename from include/villas/nodes/uldaq.h rename to include/villas/nodes/uldaq.hpp index 970eee368..fe7d15cff 100644 --- a/include/villas/nodes/uldaq.h +++ b/include/villas/nodes/uldaq.hpp @@ -35,10 +35,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - #include #define ULDAQ_MAX_DEV_COUNT 100 @@ -75,8 +71,4 @@ struct uldaq { } out; }; -#ifdef __cplusplus -} -#endif - /** @} */ diff --git a/include/villas/nodes/websocket.h b/include/villas/nodes/websocket.hpp similarity index 97% rename from include/villas/nodes/websocket.h rename to include/villas/nodes/websocket.hpp index c83de246e..b31f6b73f 100644 --- a/include/villas/nodes/websocket.h +++ b/include/villas/nodes/websocket.hpp @@ -37,10 +37,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - #define DEFAULT_WEBSOCKET_QUEUE_LENGTH (DEFAULT_QUEUE_LENGTH * 64) #define DEFAULT_WEBSOCKET_SAMPLE_LENGTH DEFAULT_SAMPLE_LENGTH @@ -117,7 +113,3 @@ int websocket_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned int websocket_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/include/villas/nodes/zeromq.h b/include/villas/nodes/zeromq.hpp similarity index 97% rename from include/villas/nodes/zeromq.h rename to include/villas/nodes/zeromq.hpp index b9b586f93..973e6e6f5 100644 --- a/include/villas/nodes/zeromq.h +++ b/include/villas/nodes/zeromq.hpp @@ -35,10 +35,6 @@ #include #include -#ifdef __cplusplus -extern "C" { -#endif - #if ZMQ_BUILD_DRAFT_API && (ZMQ_VERSION_MAJOR > 4 || (ZMQ_VERSION_MAJOR == 4 && ZMQ_VERSION_MINOR >= 2)) #define ZMQ_BUILD_DISH 1 #endif @@ -109,7 +105,3 @@ int zeromq_read(struct node *n, struct sample *smps[], unsigned cnt, unsigned *r int zeromq_write(struct node *n, struct sample *smps[], unsigned cnt, unsigned *release); /** @} */ - -#ifdef __cplusplus -} -#endif diff --git a/lib/kernel/if.cpp b/lib/kernel/if.cpp index c9a17398f..e7ec4551d 100644 --- a/lib/kernel/if.cpp +++ b/lib/kernel/if.cpp @@ -36,7 +36,7 @@ #include #include -#include +#include int if_init(struct interface *i, struct rtnl_link *link) { diff --git a/lib/memory/ib.cpp b/lib/memory/ib.cpp index 9a85368e8..5f3511b29 100644 --- a/lib/memory/ib.cpp +++ b/lib/memory/ib.cpp @@ -22,7 +22,7 @@ #include -#include +#include #include #include #include diff --git a/lib/nodes/amqp.cpp b/lib/nodes/amqp.cpp index 4aa424272..6bc3c35e4 100644 --- a/lib/nodes/amqp.cpp +++ b/lib/nodes/amqp.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/lib/nodes/comedi.cpp b/lib/nodes/comedi.cpp index 0b52bde64..aa52745eb 100644 --- a/lib/nodes/comedi.cpp +++ b/lib/nodes/comedi.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include /* Utility functions to dump a comedi_cmd graciously taken from comedilib demo */ diff --git a/lib/nodes/file.cpp b/lib/nodes/file.cpp index 820465f16..2cf02c521 100644 --- a/lib/nodes/file.cpp +++ b/lib/nodes/file.cpp @@ -27,7 +27,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/nodes/iec61850.cpp b/lib/nodes/iec61850.cpp index 18dca5fac..b5d8be4ff 100644 --- a/lib/nodes/iec61850.cpp +++ b/lib/nodes/iec61850.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include diff --git a/lib/nodes/iec61850_sv.cpp b/lib/nodes/iec61850_sv.cpp index 52def5ced..f13379b6f 100644 --- a/lib/nodes/iec61850_sv.cpp +++ b/lib/nodes/iec61850_sv.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #define CONFIG_SV_DEFAULT_APPID 0x4000 diff --git a/lib/nodes/infiniband.cpp b/lib/nodes/infiniband.cpp index b27245fe7..c1872815d 100644 --- a/lib/nodes/infiniband.cpp +++ b/lib/nodes/infiniband.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/nodes/influxdb.cpp b/lib/nodes/influxdb.cpp index 8834e4489..2b34f9534 100644 --- a/lib/nodes/influxdb.cpp +++ b/lib/nodes/influxdb.cpp @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include int influxdb_parse(struct node *n, json_t *json) diff --git a/lib/nodes/loopback.cpp b/lib/nodes/loopback.cpp index 669d5e278..9e97bc6aa 100644 --- a/lib/nodes/loopback.cpp +++ b/lib/nodes/loopback.cpp @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include int loopback_parse(struct node *n, json_t *cfg) diff --git a/lib/nodes/mqtt.cpp b/lib/nodes/mqtt.cpp index 9d1936476..0e901872a 100644 --- a/lib/nodes/mqtt.cpp +++ b/lib/nodes/mqtt.cpp @@ -23,7 +23,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/nodes/nanomsg.cpp b/lib/nodes/nanomsg.cpp index 014998182..5d38d0d4b 100644 --- a/lib/nodes/nanomsg.cpp +++ b/lib/nodes/nanomsg.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/lib/nodes/ngsi.cpp b/lib/nodes/ngsi.cpp index 05df5e66c..de68ec6ba 100644 --- a/lib/nodes/ngsi.cpp +++ b/lib/nodes/ngsi.cpp @@ -28,7 +28,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/nodes/opal.cpp b/lib/nodes/opal.cpp index 37a27b702..c146c5ad4 100644 --- a/lib/nodes/opal.cpp +++ b/lib/nodes/opal.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include #include diff --git a/lib/nodes/rtp.cpp b/lib/nodes/rtp.cpp index c7150845a..a0df2f0da 100644 --- a/lib/nodes/rtp.cpp +++ b/lib/nodes/rtp.cpp @@ -27,20 +27,20 @@ #include #include +#include + extern "C" { -#include -#include -#include -#include -#include -#include -#include -#undef ALIGN_MASK + #include + #include + #include + #include + #include + #include + #undef ALIGN_MASK } #include -#include -#include +#include #include #include #include diff --git a/lib/nodes/shmem.cpp b/lib/nodes/shmem.cpp index efac6a951..38dfdd46a 100644 --- a/lib/nodes/shmem.cpp +++ b/lib/nodes/shmem.cpp @@ -31,7 +31,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/nodes/signal_generator.cpp b/lib/nodes/signal_generator.cpp index 1019fcee5..eaea26d58 100644 --- a/lib/nodes/signal_generator.cpp +++ b/lib/nodes/signal_generator.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include static enum signal_generator::type signal_generator_lookup_type(const char *type) { diff --git a/lib/nodes/socket.cpp b/lib/nodes/socket.cpp index 6ce53a1ae..96e38c331 100644 --- a/lib/nodes/socket.cpp +++ b/lib/nodes/socket.cpp @@ -26,7 +26,7 @@ #include #include -#include +#include #include #include #include diff --git a/lib/nodes/test_rtt.cpp b/lib/nodes/test_rtt.cpp index 34a84259b..5d7dc9078 100644 --- a/lib/nodes/test_rtt.cpp +++ b/lib/nodes/test_rtt.cpp @@ -29,7 +29,7 @@ #include #include #include -#include +#include static struct plugin p; diff --git a/lib/nodes/uldaq.cpp b/lib/nodes/uldaq.cpp index 0415f10c6..69838b1d6 100644 --- a/lib/nodes/uldaq.cpp +++ b/lib/nodes/uldaq.cpp @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include static unsigned num_devs = ULDAQ_MAX_DEV_COUNT; diff --git a/lib/nodes/websocket.cpp b/lib/nodes/websocket.cpp index 219164a36..850693511 100644 --- a/lib/nodes/websocket.cpp +++ b/lib/nodes/websocket.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/lib/nodes/zeromq.cpp b/lib/nodes/zeromq.cpp index 720826a24..c9d8c494a 100644 --- a/lib/nodes/zeromq.cpp +++ b/lib/nodes/zeromq.cpp @@ -27,7 +27,7 @@ #include #endif -#include +#include #include #include #include diff --git a/lib/web.cpp b/lib/web.cpp index 12351b028..bf195ca8d 100644 --- a/lib/web.cpp +++ b/lib/web.cpp @@ -31,7 +31,7 @@ #include #include -#include +#include using namespace villas; using namespace villas::node; diff --git a/src/villas-node.cpp b/src/villas-node.cpp index 56cc80e4e..9b3cbc1b0 100644 --- a/src/villas-node.cpp +++ b/src/villas-node.cpp @@ -47,7 +47,7 @@ #include #ifdef ENABLE_OPAL_ASYNC - #include + #include #endif using namespace villas; diff --git a/src/villas-pipe.cpp b/src/villas-pipe.cpp index f69a9815c..9474f76a1 100644 --- a/src/villas-pipe.cpp +++ b/src/villas-pipe.cpp @@ -47,7 +47,7 @@ #include #include #include -#include +#include using namespace villas; using namespace villas::node; diff --git a/src/villas-signal.cpp b/src/villas-signal.cpp index 471545acc..4f32ad690 100644 --- a/src/villas-signal.cpp +++ b/src/villas-signal.cpp @@ -40,7 +40,7 @@ #include #include #include -#include +#include using namespace villas;