From 3dabe009e0c8bbf408726829b473a69c0427b4c5 Mon Sep 17 00:00:00 2001
From: malte_langkabel <malte.langkabel@gmail.com>
Date: Tue, 1 Jul 2014 14:25:28 +0200
Subject: [PATCH] data: compile error fix

fixed compile errors for TokenLocation.
---
 src/lib/data/location/TokenLocation.cpp         | 7 ++++++-
 src/lib/data/location/TokenLocationCollection.h | 1 +
 src/lib/data/location/TokenLocationFile.h       | 1 +
 src/lib/data/location/TokenLocationLine.h       | 1 +
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/lib/data/location/TokenLocation.cpp b/src/lib/data/location/TokenLocation.cpp
index 7629280f..078cb386 100644
--- a/src/lib/data/location/TokenLocation.cpp
+++ b/src/lib/data/location/TokenLocation.cpp
@@ -3,7 +3,12 @@
 #include "data/location/TokenLocationLine.h"
 
 TokenLocation::TokenLocation(Id tokenId, TokenLocationLine* line, unsigned int columnNumber, bool isStart)
-	: TokenLocation(s_locationId++, tokenId, line, columnNumber, isStart)
+	: m_id(s_locationId++)
+	, m_tokenId(tokenId)
+	, m_line(line)
+	, m_columnNumber(columnNumber)
+	, m_other(nullptr)
+	, m_isStart(isStart)
 {
 }
 
diff --git a/src/lib/data/location/TokenLocationCollection.h b/src/lib/data/location/TokenLocationCollection.h
index 0b586592..84211388 100644
--- a/src/lib/data/location/TokenLocationCollection.h
+++ b/src/lib/data/location/TokenLocationCollection.h
@@ -1,6 +1,7 @@
 #ifndef TOKEN_LOCATION_COLLECTION_H
 #define TOKEN_LOCATION_COLLECTION_H
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <ostream>
diff --git a/src/lib/data/location/TokenLocationFile.h b/src/lib/data/location/TokenLocationFile.h
index 13f0ffa6..dd7cb09b 100644
--- a/src/lib/data/location/TokenLocationFile.h
+++ b/src/lib/data/location/TokenLocationFile.h
@@ -1,6 +1,7 @@
 #ifndef TOKEN_LOCATION_FILE_H
 #define TOKEN_LOCATION_FILE_H
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <ostream>
diff --git a/src/lib/data/location/TokenLocationLine.h b/src/lib/data/location/TokenLocationLine.h
index 2b6a61f7..a59f402f 100644
--- a/src/lib/data/location/TokenLocationLine.h
+++ b/src/lib/data/location/TokenLocationLine.h
@@ -1,6 +1,7 @@
 #ifndef TOKEN_LOCATION_LINE_H
 #define TOKEN_LOCATION_LINE_H
 
+#include <functional>
 #include <map>
 #include <memory>
 #include <ostream>