more include fixes... (cd9185d8) · Commits · github_fork / Clip

build/cmake/CMakeLists.txt

+2 −1

Original line number	Diff line number	Diff line
		@@ -39,7 +39,8 @@ set(FNORDMETRIC_QUERY_SOURCES
		stage/src/fnordmetric/query/tokenize.cc)

		set(FNORDMETRIC_CSV_BACKEND_SOURCES
		stage/src/fnordmetric/query/backends/csv/csvinputstream.cc)
		stage/src/fnordmetric/query/backends/csv/csvinputstream.cc
		stage/src/fnordmetric/query/backends/csv/csvtableref.cc)

		include_directories(stage/src)
		set(CMAKE_CXX_FLAGS "-std=c++0x -stdlib=libc++")

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@ all:
		(cd target && cmake .. && make)

		test: all
		@find target/tests -iname "test-*" \| while read t; do $$t \|\| exit 1; done
		@find target/tests -iname "test-*" \| while read t; do (cd ../../ && build/cmake/$$t) \|\| exit 1; done

		clean:
		rm -rf target stage

+12 −11

Original line number	Diff line number	Diff line
		@@ -5,23 +5,24 @@
		* Licensed under the MIT license (see LICENSE).
		*/
		#include <memory>
		#include <query/tableref.h>
		#include <query/backends/csv/csvtableref.h>
		#include <fnordmetric/query/backends/csv/csvtableref.h>
		#include <fnordmetric/query/backends/csv/csvinputstream.h>
		#include <fnordmetric/query/tableref.h>

		namespace fnordmetric {
		namespace query {
		namespace csv_backend {

		class CSVTableRef : public TableRef {
		public:
		CSVTableRef(std::unique_ptr<CSVInputStream>&& csv);
		int getColumnIndex(const std::string& name) override;
		void executeScan(TableScan* scan) override;
		protected:
		std::unique_ptr<CSVInputStream> csv_;
		};
		CSVTableRef::CSVTableRef(
		std::unique_ptr<CSVInputStream>&& csv) :
		csv_(std::move(csv)) {}

		int CSVTableRef::getColumnIndex(const std::string& name) {
		}

		void CSVTableRef::executeScan(TableScan* scan) {
		}

		}
		}
		}
		#endif

+1 −0

Original line number	Diff line number	Diff line
		@@ -7,6 +7,7 @@
		#ifndef _FNORDMETRIC_CSVTABLEREF_H
		#define _FNORDMETRIC_CSVTABLEREF_H
		#include <memory>
		#include <fnordmetric/query/backends/csv/csvinputstream.h>
		#include <fnordmetric/query/tableref.h>

		namespace fnordmetric {

+10 −10

Original line number	Diff line number	Diff line
		@@ -7,16 +7,16 @@
		#include <stdlib.h>
		#include <string.h>
		#include <memory>
		#include "query.h"
		#include "query/axisstatement.h"
		#include "query/drawstatement.h"
		#include "query/executable.h"
		#include "query/parser.h"
		#include "query/queryplan.h"
		#include "query/resultlist.h"
		#include "query/seriesstatement.h"
		#include "query/tablerepository.h"
		#include "query/resultlist.h"
		#include <fnordmetric/query/query.h>
		#include <fnordmetric/query/axisstatement.h>
		#include <fnordmetric/query/drawstatement.h>
		#include <fnordmetric/query/executable.h>
		#include <fnordmetric/query/parser.h>
		#include <fnordmetric/query/queryplan.h>
		#include <fnordmetric/query/resultlist.h>
		#include <fnordmetric/query/seriesstatement.h>
		#include <fnordmetric/query/tablerepository.h>
		#include <fnordmetric/query/resultlist.h>

		namespace fnordmetric {
		namespace query {