2
0
Branimir Karadžić 10 жил өмнө
parent
commit
140b766b7e

+ 2 - 2
include/tinystl/vector.h

@@ -280,7 +280,7 @@ namespace tinystl {
 	}
 
 	template<typename T, typename Alloc>
-	inline void vector<T, Alloc>::insert(vector::iterator where) {
+	inline void vector<T, Alloc>::insert(iterator where) {
 		buffer_insert(&m_buffer, where, 1);
 	}
 
@@ -316,7 +316,7 @@ namespace tinystl {
 
 	template<typename T, typename Alloc>
 	template<typename Param>
-	void vector<T, Alloc>::emplace(vector::iterator where, const Param& param) {
+	void vector<T, Alloc>::emplace(iterator where, const Param& param) {
 		buffer_insert(&m_buffer, where, &param, &param + 1);
 	}
 }

+ 0 - 1
scripts/genie.lua

@@ -36,7 +36,6 @@ dofile "unittest++.lua"
 dofile "bin2c.lua"
 
 project "bx.test"
-	uuid "8a653da8-23d6-11e3-acb4-887628d43830"
 	kind "ConsoleApp"
 
 	debugdir (path.join(BX_DIR, "tests"))

+ 1 - 2
scripts/unittest++.lua

@@ -4,7 +4,6 @@
 --
 
 project "UnitTest++"
-	uuid "ab932f5c-2409-11e3-b000-887628d43830"
 	kind "StaticLib"
 
 	removeflags {
@@ -16,7 +15,7 @@ project "UnitTest++"
 		"../3rdparty/UnitTest++/src/*.h",
 	}
 
-	configuration { "linux or osx or android-* or *nacl*" }
+	configuration { "linux or osx or android-* or *nacl* or ps4" }
 		files {
 			"../3rdparty/UnitTest++/src/Posix/**.cpp",
 			"../3rdparty/UnitTest++/src/Posix/**.h",