[Bf-blender-cvs] [9daac19] master: Cycles: Correction for C++11 compilation error after recent vector changes

[Sergey Sharybin]

Commit: 9daac198f5610b7e7bb5354789082b97a8e11b36
Author: Sergey Sharybin
Date:   Mon Feb 16 15:38:13 2015 +0500
Branches: master
https://developer.blender.org/rB9daac198f5610b7e7bb5354789082b97a8e11b36

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

===================================================================

M	intern/cycles/util/util_vector.h

===================================================================

diff --git a/intern/cycles/util/util_vector.h b/intern/cycles/util/util_vector.h
index cf8fd22..92c3f11 100644
--- 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);