# HG changeset patch
# User František Kučera <franta-hg@frantovo.cz>
# Date 1535214302 -7200
# Node ID 09ca53671b2805ac3e9dde8e61473ac9680d2266
# Parent  e8de089f95dde273cf9dc88ed0c8583985494a72
remove DataTypeReader.cpp (move implementation to DataTypeReader.h)

diff -r e8de089f95dd -r 09ca53671b28 nbproject/Makefile-Debug.mk
--- a/nbproject/Makefile-Debug.mk	Sat Aug 25 18:16:53 2018 +0200
+++ b/nbproject/Makefile-Debug.mk	Sat Aug 25 18:25:02 2018 +0200
@@ -35,7 +35,6 @@
 
 # Object Files
 OBJECTFILES= \
-	${OBJECTDIR}/src/DataTypeReader.o \
 	${OBJECTDIR}/src/Factory.o
 
 
@@ -63,11 +62,6 @@
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/librelpipe-lib-reader.cpp.${CND_DLIB_EXT} ${OBJECTFILES} ${LDLIBSOPTIONS} -shared -fPIC
 
-${OBJECTDIR}/src/DataTypeReader.o: src/DataTypeReader.cpp
-	${MKDIR} -p ${OBJECTDIR}/src
-	${RM} "$@.d"
-	$(COMPILE.cc) -g `pkg-config --cflags relpipe-lib-protocol.cpp`   -fPIC  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/DataTypeReader.o src/DataTypeReader.cpp
-
 ${OBJECTDIR}/src/Factory.o: src/Factory.cpp
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
diff -r e8de089f95dd -r 09ca53671b28 nbproject/Makefile-Release.mk
--- a/nbproject/Makefile-Release.mk	Sat Aug 25 18:16:53 2018 +0200
+++ b/nbproject/Makefile-Release.mk	Sat Aug 25 18:25:02 2018 +0200
@@ -35,7 +35,6 @@
 
 # Object Files
 OBJECTFILES= \
-	${OBJECTDIR}/src/DataTypeReader.o \
 	${OBJECTDIR}/src/Factory.o
 
 
@@ -63,11 +62,6 @@
 	${MKDIR} -p ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}
 	${LINK.cc} -o ${CND_DISTDIR}/${CND_CONF}/${CND_PLATFORM}/librelpipe-lib-reader.cpp.${CND_DLIB_EXT} ${OBJECTFILES} ${LDLIBSOPTIONS} -shared -fPIC
 
-${OBJECTDIR}/src/DataTypeReader.o: src/DataTypeReader.cpp
-	${MKDIR} -p ${OBJECTDIR}/src
-	${RM} "$@.d"
-	$(COMPILE.cc) -O2 `pkg-config --cflags relpipe-lib-protocol.cpp`   -fPIC  -MMD -MP -MF "$@.d" -o ${OBJECTDIR}/src/DataTypeReader.o src/DataTypeReader.cpp
-
 ${OBJECTDIR}/src/Factory.o: src/Factory.cpp
 	${MKDIR} -p ${OBJECTDIR}/src
 	${RM} "$@.d"
diff -r e8de089f95dd -r 09ca53671b28 nbproject/configurations.xml
--- a/nbproject/configurations.xml	Sat Aug 25 18:16:53 2018 +0200
+++ b/nbproject/configurations.xml	Sat Aug 25 18:25:02 2018 +0200
@@ -24,7 +24,6 @@
     <logicalFolder name="SourceFiles"
                    displayName="Source Files"
                    projectFiles="true">
-      <itemPath>src/DataTypeReader.cpp</itemPath>
       <itemPath>src/Factory.cpp</itemPath>
     </logicalFolder>
     <logicalFolder name="TestFiles"
@@ -73,8 +72,6 @@
       </item>
       <item path="include/relpipe/reader/typedefs.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/DataTypeReader.cpp" ex="false" tool="1" flavor2="0">
-      </item>
       <item path="src/DataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/DataTypeReaderBase.h" ex="false" tool="3" flavor2="0">
@@ -133,8 +130,6 @@
       </item>
       <item path="include/relpipe/reader/typedefs.h" ex="false" tool="3" flavor2="0">
       </item>
-      <item path="src/DataTypeReader.cpp" ex="false" tool="1" flavor2="0">
-      </item>
       <item path="src/DataTypeReader.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="src/DataTypeReaderBase.h" ex="false" tool="3" flavor2="0">
diff -r e8de089f95dd -r 09ca53671b28 src/DataTypeReader.cpp
--- a/src/DataTypeReader.cpp	Sat Aug 25 18:16:53 2018 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
-#include "DataTypeReader.h"
-
-namespace relpipe {
-namespace reader {
-
-template<typename T> string_t DataTypeReader<T>::readString(std::istream &input) {
-	return toString(readValue(input));
-};
-
-}
-}
diff -r e8de089f95dd -r 09ca53671b28 src/DataTypeReader.h
--- a/src/DataTypeReader.h	Sat Aug 25 18:16:53 2018 +0200
+++ b/src/DataTypeReader.h	Sat Aug 25 18:25:02 2018 +0200
@@ -16,7 +16,9 @@
 
 	virtual T readValue(std::istream& input) = 0;
 
-	virtual string_t readString(std::istream &input);
+	virtual string_t readString(std::istream &input) {
+		return toString(readValue(input));
+	}
 
 	virtual string_t toString(const T& value) = 0;