--- a/nbproject/Makefile-Debug.mk Mon Aug 13 20:30:55 2018 +0200
+++ b/nbproject/Makefile-Debug.mk Sun Aug 19 20:36:33 2018 +0200
@@ -52,7 +52,7 @@
ASFLAGS=
# Link Libraries and Options
-LDLIBSOPTIONS=
+LDLIBSOPTIONS=`pkg-config --libs relpipe-lib-protocol.cpp`
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
@@ -65,7 +65,7 @@
${OBJECTDIR}/src/Factory.o: src/Factory.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.cc) -g -fPIC -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/Factory.o src/Factory.cpp
+ $(COMPILE.cc) -g `pkg-config --cflags relpipe-lib-protocol.cpp` -fPIC -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/Factory.o src/Factory.cpp
# Subprojects
.build-subprojects:
--- a/nbproject/Makefile-Release.mk Mon Aug 13 20:30:55 2018 +0200
+++ b/nbproject/Makefile-Release.mk Sun Aug 19 20:36:33 2018 +0200
@@ -52,7 +52,7 @@
ASFLAGS=
# Link Libraries and Options
-LDLIBSOPTIONS=
+LDLIBSOPTIONS=`pkg-config --libs relpipe-lib-protocol.cpp`
# Build Targets
.build-conf: ${BUILD_SUBPROJECTS}
@@ -65,7 +65,7 @@
${OBJECTDIR}/src/Factory.o: src/Factory.cpp
${MKDIR} -p ${OBJECTDIR}/src
${RM} "$@.d"
- $(COMPILE.cc) -O2 -fPIC -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/Factory.o src/Factory.cpp
+ $(COMPILE.cc) -O2 `pkg-config --cflags relpipe-lib-protocol.cpp` -fPIC -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/Factory.o src/Factory.cpp
# Subprojects
.build-subprojects:
--- a/nbproject/configurations.xml Mon Aug 13 20:30:55 2018 +0200
+++ b/nbproject/configurations.xml Sun Aug 19 20:36:33 2018 +0200
@@ -50,6 +50,11 @@
<ccTool>
<commandLine>-fsanitize=address</commandLine>
</ccTool>
+ <linkerTool>
+ <linkerLibItems>
+ <linkerOptionItem>`pkg-config --libs relpipe-lib-protocol.cpp`</linkerOptionItem>
+ </linkerLibItems>
+ </linkerTool>
</compileType>
<item path="include/relpipe/writer/Factory.h" ex="false" tool="3" flavor2="0">
</item>
@@ -103,6 +108,11 @@
<asmTool>
<developmentMode>5</developmentMode>
</asmTool>
+ <linkerTool>
+ <linkerLibItems>
+ <linkerOptionItem>`pkg-config --libs relpipe-lib-protocol.cpp`</linkerOptionItem>
+ </linkerLibItems>
+ </linkerTool>
</compileType>
<item path="include/relpipe/writer/Factory.h" ex="false" tool="3" flavor2="0">
</item>
--- a/src/Factory.cpp Mon Aug 13 20:30:55 2018 +0200
+++ b/src/Factory.cpp Sun Aug 19 20:36:33 2018 +0200
@@ -1,3 +1,5 @@
+#include <relpipe/protocol/constants.h>
+
#include "../include/relpipe/writer/RelationalWriter.h"
#include "../include/relpipe/writer/Factory.h"
#include "StreamRelationalWriter.h"
@@ -9,5 +11,20 @@
return new StreamRelationalWriter(output);
}
+/**
+ * Some basic constants defined in lib-protocol are re-exported in public headers of lib-reader and lib-writer,
+ * so we should check (during compile-time) that they match.
+ */
+#define PROTOCOL_VIOLATION_TYPE_ID_ERROR "type id does not match with protocol"
+static_assert((int) TypeId::BOOLEAN == relpipe::protocol::DATA_TYPE_ID_BOOLEAN, PROTOCOL_VIOLATION_TYPE_ID_ERROR);
+static_assert((int) TypeId::STRING == relpipe::protocol::DATA_TYPE_ID_STRING, PROTOCOL_VIOLATION_TYPE_ID_ERROR);
+static_assert((int) TypeId::INTEGER == relpipe::protocol::DATA_TYPE_ID_INTEGER, PROTOCOL_VIOLATION_TYPE_ID_ERROR);
+
+#define PROTOCOL_VIOLATION_TYPE_DEF_ERROR "type definition does not match with protocol"
+static_assert(std::is_same<relpipe::writer::boolean_t, typename relpipe::protocol::boolean_t>::value, PROTOCOL_VIOLATION_TYPE_DEF_ERROR);
+static_assert(std::is_same<relpipe::writer::integer_t, typename relpipe::protocol::integer_t>::value, PROTOCOL_VIOLATION_TYPE_DEF_ERROR);
+static_assert(std::is_same<relpipe::writer::string_t, typename relpipe::protocol::string_t>::value, PROTOCOL_VIOLATION_TYPE_DEF_ERROR);
+static_assert(std::is_same<relpipe::writer::octet_t, typename relpipe::protocol::octet_t>::value, PROTOCOL_VIOLATION_TYPE_DEF_ERROR);
+
}
}
\ No newline at end of file