--- a/include/DataTypeWriterBase.h Mon Jul 09 00:43:35 2018 +0200
+++ b/include/DataTypeWriterBase.h Fri Jul 13 23:02:09 2018 +0200
@@ -1,7 +1,7 @@
#pragma once
#include <string>
-#include "common.h"
+#include "typedefs.h"
namespace relpipe {
namespace writer {
--- a/include/common.h Mon Jul 09 00:43:35 2018 +0200
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-#pragma once
-
-#include <cstdint>
-#include <string>
-
-namespace relpipe {
-namespace writer {
-
-using octet_t = uint8_t;
-using integer_t = uint64_t;
-using boolean_t = bool;
-using string_t = std::wstring;
-
-const integer_t DATA_TYPE_ID_BOOLEAN = 1;
-const integer_t DATA_TYPE_ID_INTEGER = 2;
-const integer_t DATA_TYPE_ID_STRING = 3;
-
-const string_t DATA_TYPE_CODE_BOOLEAN = L"boolean";
-const string_t DATA_TYPE_CODE_INTEGER = L"integer";
-const string_t DATA_TYPE_CODE_STRING = L"string";
-
-
-/**
- * With respect for the tradition and computer pioneers, we use same numbers as in ASCII texts:
- *
- * 1C FS ␜ File Separator
- * 1D GS ␝ Group Separator
- * 1E RS ␞ Record Separator
- * 1F US ␟ Unit Separator
- *
- */
-const integer_t DATA_PART_START = 0x1D;
-const integer_t DATA_PART_ROW = 0x1E;
-
-}
-}
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/include/typedefs.h Fri Jul 13 23:02:09 2018 +0200
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace relpipe {
+namespace writer {
+
+using octet_t = uint8_t;
+using integer_t = uint64_t;
+using boolean_t = bool;
+using string_t = std::wstring;
+
+}
+}
\ No newline at end of file
--- a/nbproject/configurations.xml Mon Jul 09 00:43:35 2018 +0200
+++ b/nbproject/configurations.xml Fri Jul 13 23:02:09 2018 +0200
@@ -6,7 +6,7 @@
projectFiles="true">
<itemPath>include/DataTypeWriter.h</itemPath>
<itemPath>include/DataTypeWriterBase.h</itemPath>
- <itemPath>include/common.h</itemPath>
+ <itemPath>include/typedefs.h</itemPath>
</logicalFolder>
<logicalFolder name="ResourceFiles"
displayName="Resource Files"
@@ -17,6 +17,7 @@
projectFiles="true">
<itemPath>src/DataTypeWriter.cpp</itemPath>
<itemPath>src/DataTypeWriterBase.cpp</itemPath>
+ <itemPath>src/format.h</itemPath>
</logicalFolder>
<logicalFolder name="TestFiles"
displayName="Test Files"
@@ -44,12 +45,14 @@
</item>
<item path="include/DataTypeWriterBase.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="include/common.h" ex="false" tool="3" flavor2="0">
+ <item path="include/typedefs.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/DataTypeWriter.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/DataTypeWriterBase.cpp" ex="false" tool="1" flavor2="0">
</item>
+ <item path="src/format.h" ex="false" tool="3" flavor2="0">
+ </item>
</conf>
<conf name="Release" type="2">
<toolsSet>
@@ -75,12 +78,14 @@
</item>
<item path="include/DataTypeWriterBase.h" ex="false" tool="3" flavor2="0">
</item>
- <item path="include/common.h" ex="false" tool="3" flavor2="0">
+ <item path="include/typedefs.h" ex="false" tool="3" flavor2="0">
</item>
<item path="src/DataTypeWriter.cpp" ex="false" tool="1" flavor2="0">
</item>
<item path="src/DataTypeWriterBase.cpp" ex="false" tool="1" flavor2="0">
</item>
+ <item path="src/format.h" ex="false" tool="3" flavor2="0">
+ </item>
</conf>
</confs>
</configurationDescriptor>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/format.h Fri Jul 13 23:02:09 2018 +0200
@@ -0,0 +1,31 @@
+#pragma once
+
+#include <cstdint>
+#include <string>
+
+namespace relpipe {
+namespace writer {
+
+const integer_t DATA_TYPE_ID_BOOLEAN = 1;
+const integer_t DATA_TYPE_ID_INTEGER = 2;
+const integer_t DATA_TYPE_ID_STRING = 3;
+
+const string_t DATA_TYPE_CODE_BOOLEAN = L"boolean";
+const string_t DATA_TYPE_CODE_INTEGER = L"integer";
+const string_t DATA_TYPE_CODE_STRING = L"string";
+
+
+/**
+ * With respect for the tradition and computer pioneers, we use same numbers as in ASCII texts:
+ *
+ * 1C FS ␜ File Separator
+ * 1D GS ␝ Group Separator
+ * 1E RS ␞ Record Separator
+ * 1F US ␟ Unit Separator
+ *
+ */
+const integer_t DATA_PART_START = 0x1D;
+const integer_t DATA_PART_ROW = 0x1E;
+
+}
+}
\ No newline at end of file