From d96dbb9fe8efef840d15e5cc2111f11cd165ec5c Mon Sep 17 00:00:00 2001
From: King_DuckZ <king_duckz@gmx.com>
Date: Fri, 17 Mar 2017 00:30:34 +0000
Subject: [PATCH] Update vectorwrapper.

Also make the necessary changes to fix the build after the update.
---
 CMakeLists.txt                | 2 ++
 lib/clooneljump               | 2 +-
 lib/vectorwrapper             | 2 +-
 src/gamelib/drawing_queue.cpp | 1 -
 src/gamelib/texture.cpp       | 2 +-
 src/gamelib/vector.hpp        | 2 ++
 6 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a728ebe..01c7780 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,6 +11,7 @@ option(CURRY_FORCE_OPENGLES "Try to chose the openGL ES renderer if available. E
 option(CURRY_RASPBERRY_PI "Compile for Raspberry Pi" OFF)
 
 set(MYCURRY_RESOURCES_PATH "${CMAKE_CURRENT_SOURCE_DIR}" CACHE STRING "Path to the program's resources")
+set(CLOONEL_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/lib/clooneljump")
 
 target_architecture(TARGET_ARCH)
 message (STATUS "Target architecture: ${TARGET_ARCH}")
@@ -57,6 +58,7 @@ add_library(${PROJECT_NAME} INTERFACE)
 target_compile_options(${PROJECT_NAME} INTERFACE ${common_gcc_flags})
 target_compile_definitions(${PROJECT_NAME}
 	INTERFACE $<$<CONFIG:Debug>:KAK_DEBUG>
+	INTERFACE VWR_OUTER_NAMESPACE=curry
 )
 target_include_directories(${PROJECT_NAME}
 	INTERFACE lib/kakoune
diff --git a/lib/clooneljump b/lib/clooneljump
index ceb3e18..8669e5e 160000
--- a/lib/clooneljump
+++ b/lib/clooneljump
@@ -1 +1 @@
-Subproject commit ceb3e180fee15ba3d6e7b17e8f88261b35d4ae92
+Subproject commit 8669e5e67476a1e6c6e6582e2fd46b1a29100b0c
diff --git a/lib/vectorwrapper b/lib/vectorwrapper
index aaa8e75..546bd7e 160000
--- a/lib/vectorwrapper
+++ b/lib/vectorwrapper
@@ -1 +1 @@
-Subproject commit aaa8e75dc125e4116bed76ed14cbfc028bf6e9c7
+Subproject commit 546bd7e270b486aa8b7e898a0e3008baa84ef6d8
diff --git a/src/gamelib/drawing_queue.cpp b/src/gamelib/drawing_queue.cpp
index a83bcf7..3bd72ce 100644
--- a/src/gamelib/drawing_queue.cpp
+++ b/src/gamelib/drawing_queue.cpp
@@ -125,7 +125,6 @@ namespace curry {
 	bool DrawingQueue::add_layer (uint16_t parName) {
 		auto& idx_map = m_local_data->layer_idx_map;
 		auto it_found = idx_map.lower_bound(parName);
-		assert(&*it_found != nullptr or idx_map.end() == it_found);
 		if (it_found != idx_map.end() and it_found->first == parName) {
 			return false;
 		}
diff --git a/src/gamelib/texture.cpp b/src/gamelib/texture.cpp
index 8a040c2..8e164b4 100644
--- a/src/gamelib/texture.cpp
+++ b/src/gamelib/texture.cpp
@@ -74,7 +74,7 @@ namespace curry {
 	}
 
 	void Texture::load_empty (cloonel::SDLMain& parSDLMain, const vec2us& parSize) {
-		assert(parSize > 0);
+		assert(parSize > static_cast<uint16_t>(0));
 		m_texture = SDLTextureAuto(
 				SDL_CreateTexture(
 					parSDLMain.GetRenderer(),
diff --git a/src/gamelib/vector.hpp b/src/gamelib/vector.hpp
index ab44966..34c2221 100644
--- a/src/gamelib/vector.hpp
+++ b/src/gamelib/vector.hpp
@@ -39,6 +39,7 @@
         } \
     }
 
+namespace curry {
 namespace vwr {
 	SPECIALIZE_ARRAY_VECTOR(float, 2);
 	SPECIALIZE_ARRAY_VECTOR(uint16_t, 2);
@@ -95,6 +96,7 @@ namespace vwr {
 		return implem::vector_cast(parVec, to, std::make_index_sequence<Vec<FROM>::dimensions>());
 	}
 } //namespace vwr
+} //namespace curry
 
 namespace curry {
 	using vec2f = vwr::Vec<std::array<float, 2>>;