From: Karl Ljungkvist Date: Mon, 10 Aug 2015 08:08:27 +0000 (+0200) Subject: make tbb work with c++11 and nvcc X-Git-Tag: v8.5.0-rc1~1195^2 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=164ff260f8669db0f2fbe240592a9045f78c084d;p=dealii.git make tbb work with c++11 and nvcc --- diff --git a/bundled/tbb41_20130401oss/include/tbb/concurrent_vector.h b/bundled/tbb41_20130401oss/include/tbb/concurrent_vector.h index 41cfbc78a9..ff2c8aa1c5 100644 --- a/bundled/tbb41_20130401oss/include/tbb/concurrent_vector.h +++ b/bundled/tbb41_20130401oss/include/tbb/concurrent_vector.h @@ -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(&t) ) : my_early_size; + return delta ? size_type(internal_grow_by( delta, sizeof(T), &initialize_array_by, static_cast(&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(&t) ) : my_early_size); + return iterator(*this, delta ? size_type(internal_grow_by( delta, sizeof(T), &initialize_array_by, static_cast(&t) )) : size_type(my_early_size)); } #endif