From 99b76d7ae1780fdc3022ae097581e10fdfff1ec7 Mon Sep 17 00:00:00 2001
From: William Moberg <william.moberg@live.se>
Date: Wed, 16 Dec 2015 12:19:43 +0100
Subject: [PATCH] Fixed returning address to temporary in functions. AABB also
 constructible from glm::vec4s.

---
 include/Engine/Core/AABB.h          | 3 ++-
 include/Engine/Core/ComponentPool.h | 2 +-
 include/Engine/Core/MemoryPool.h    | 2 +-
 src/Engine/Core/AABB.cpp            | 4 ++++
 src/Engine/Core/ComponentPool.cpp   | 2 +-
 5 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/Engine/Core/AABB.h b/include/Engine/Core/AABB.h
index 0a0adafa..c8e05248 100644
--- a/include/Engine/Core/AABB.h
+++ b/include/Engine/Core/AABB.h
@@ -9,6 +9,7 @@ public:
     AABB() = default;
     //No checks are made. Values in minPos must be less than values in maxPos, i.e. min.x < max.x, etc.
     AABB(const glm::vec3& minPos, const glm::vec3& maxPos);
+    AABB(const glm::vec4& minPos, const glm::vec4& maxPos);
     //No checks are made. Size must consist of non-negative numbers.
     virtual void CreateFromCenter(const glm::vec3& center, const glm::vec3& size);
     virtual ~AABB();
@@ -16,7 +17,7 @@ public:
     const glm::vec3& MinCorner() const { return m_MinCorner; }
     const glm::vec3& MaxCorner() const { return m_MaxCorner; }
     const glm::vec3& Center() const { return m_Center; }
-    const glm::vec3& Size() const { return 2.0f * m_HalfSize; }
+    const glm::vec3 Size() const { return 2.0f * m_HalfSize; }
     const glm::vec3& HalfSize() const { return m_HalfSize; }
 private:
     glm::vec3 m_MinCorner;
diff --git a/include/Engine/Core/ComponentPool.h b/include/Engine/Core/ComponentPool.h
index 8dd8dc29..619aade8 100644
--- a/include/Engine/Core/ComponentPool.h
+++ b/include/Engine/Core/ComponentPool.h
@@ -20,7 +20,7 @@ public:
 	~ComponentPoolForwardIterator() = default;
 	ComponentPoolForwardIterator& operator=(const ComponentPoolForwardIterator& other) = default;
 	ComponentPoolForwardIterator& operator++();
-	ComponentPoolForwardIterator& operator++(int);
+	ComponentPoolForwardIterator operator++(int);
 	bool operator!=(const ComponentPoolForwardIterator& other) const;
 	bool operator==(const ComponentPoolForwardIterator& other) const;
 	ComponentWrapper operator*() const;
diff --git a/include/Engine/Core/MemoryPool.h b/include/Engine/Core/MemoryPool.h
index 034e6dc4..ff24ac80 100644
--- a/include/Engine/Core/MemoryPool.h
+++ b/include/Engine/Core/MemoryPool.h
@@ -253,7 +253,7 @@ public:
 	}
 
 	//Postfix increment i.e. iter++. Prefer pre-increment (++iter) for efficiency.
-	MemoryPoolForwardIterator& operator++(int)
+	MemoryPoolForwardIterator operator++(int)
 	{
 		MemoryPoolForwardIterator<T> copyIter(*this);
 		operator++();
diff --git a/src/Engine/Core/AABB.cpp b/src/Engine/Core/AABB.cpp
index 9da2bdb0..05403022 100644
--- a/src/Engine/Core/AABB.cpp
+++ b/src/Engine/Core/AABB.cpp
@@ -7,6 +7,10 @@ AABB::AABB(const glm::vec3& minPos, const glm::vec3& maxPos)
     , m_HalfSize(0.5f * (maxPos - minPos))
 {}
 
+AABB::AABB(const glm::vec4& minPos, const glm::vec4& maxPos)
+    : AABB(glm::vec3(minPos), glm::vec3(maxPos))
+{}
+
 void AABB::CreateFromCenter(const glm::vec3& center, const glm::vec3& size)
 {
     m_Center = center;
diff --git a/src/Engine/Core/ComponentPool.cpp b/src/Engine/Core/ComponentPool.cpp
index ca9cc801..ce24c1f7 100644
--- a/src/Engine/Core/ComponentPool.cpp
+++ b/src/Engine/Core/ComponentPool.cpp
@@ -19,7 +19,7 @@ bool ComponentPoolForwardIterator::operator!=(const ComponentPoolForwardIterator
     return m_MemoryPoolIterator != other.m_MemoryPoolIterator;
 }
 
-ComponentPoolForwardIterator& ComponentPoolForwardIterator::operator++(int)
+ComponentPoolForwardIterator ComponentPoolForwardIterator::operator++(int)
 {
     ComponentPoolForwardIterator copyIter(*this);
     operator++();