]> https://gitweb.dealii.org/ - dealii.git/commitdiff
make tbb work with c++11 and nvcc 2384/head
authorKarl Ljungkvist <karl.ljungkvist@it.uu.se>
Mon, 10 Aug 2015 08:08:27 +0000 (10:08 +0200)
committerKarl Ljungkvist <k.ljungkvist@gmail.com>
Sun, 20 Mar 2016 01:18:20 +0000 (20:18 -0500)
bundled/tbb41_20130401oss/include/tbb/concurrent_vector.h

index 41cfbc78a9775b833c00acb89ddad0437944e1aa..ff2c8aa1c51c64e64a96c217478f9a3b826d95c2 100644 (file)
@@ -659,12 +659,12 @@ public:
 #if TBB_DEPRECATED
     /** Returns old size. */
     size_type grow_by( size_type delta ) {
-        return delta ? internal_grow_by( delta, sizeof(T), &initialize_array, NULL ) : my_early_size;
+        return delta ? size_type(internal_grow_by( delta, sizeof(T), &initialize_array, NULL )) : size_type(my_early_size);
     }
 #else
     /** Returns iterator pointing to the first new element. */
     iterator grow_by( size_type delta ) {
-        return iterator(*this, delta ? internal_grow_by( delta, sizeof(T), &initialize_array, NULL ) : my_early_size);
+        return iterator(*this, delta ? size_type(internal_grow_by( delta, sizeof(T), &initialize_array, NULL )) : size_type(my_early_size));
     }
 #endif
 
@@ -672,12 +672,12 @@ public:
 #if TBB_DEPRECATED
     /** Returns old size. */
     size_type grow_by( size_type delta, const_reference t ) {
-        return delta ? internal_grow_by( delta, sizeof(T), &initialize_array_by, static_cast<const void*>(&t) ) : my_early_size;
+        return delta ? size_type(internal_grow_by( delta, sizeof(T), &initialize_array_by, static_cast<const void*>(&t) )) : size_type(my_early_size);
     }
 #else
     /** Returns iterator pointing to the first new element. */
     iterator grow_by( size_type delta, const_reference t ) {
-        return iterator(*this, delta ? internal_grow_by( delta, sizeof(T), &initialize_array_by, static_cast<const void*>(&t) ) : my_early_size);
+        return iterator(*this, delta ? size_type(internal_grow_by( delta, sizeof(T), &initialize_array_by, static_cast<const void*>(&t) )) : size_type(my_early_size));
     }
 #endif
 

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.