Browse Source

Merge branch 'master' of github.com:bkaradzic/bx

bkaradzic 12 years ago
parent
commit
9afaeacdd7
2 changed files with 5 additions and 1 deletions
  1. 5 0
      include/tinystl/string.h
  2. 0 1
      premake/unittest++.lua

+ 5 - 0
include/tinystl/string.h

@@ -50,6 +50,7 @@ namespace tinystl {
 		void resize(size_t size);
 
 		void append(const char* first, const char* last);
+		void append(const char* str);
 
 		void swap(string& other);
 
@@ -156,6 +157,10 @@ namespace tinystl {
 		*m_last = 0;
 	}
 
+	inline void string::append(const char* str) {
+		append(str, str + strlen(str) );
+	}
+
 	inline void string::swap(string& other) {
 		const pointer tfirst = m_first, tlast = m_last, tcapacity = m_capacity;
 		m_first = other.m_first, m_last = other.m_last, m_capacity = other.m_capacity;

+ 0 - 1
premake/unittest++.lua

@@ -13,7 +13,6 @@ function flagsremove(name)
 		for index, value in pairs(tbl) do
 			if value == name then
 				table.remove(tbl, index)
-				print(index, value, type(value))
 			end
 		end
 	end