Cycles: Correction for C++11 compilation error after recent vector changes

2015-02-16 15:38:13 +05:00 · 2015-02-16 15:38:13 +05:00 · 9daac198f5
parent 9a10b208ba
commit 9daac198f5
1 changed files with 4 additions and 2 deletions
--- a/intern/cycles/util/util_vector.h
+++ b/intern/cycles/util/util_vector.h
@ -69,12 +69,14 @@ public:
 	/* Copy constructor. */
 	vector(const vector &x) : std::vector<value_type, allocator_type>(x) {  }

-#if __cplusplus < 201103L
 	void shrink_to_fit(void)
 	{
+#if __cplusplus < 201103L
 		vector<value_type>().swap(*this);
-	}
+#else
+		std::vector<value_type, allocator_type>::shrink_to_fit();
 #endif
+	}

 	void free_memory(void) {
 		std::vector<value_type, allocator_type>::resize(0);