Commit 8543f0f5 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber
Browse files

Merge branch 'develop' of geraldine.fjfi.cvut.cz:/local/projects/tnl/tnl into develop

parents 1faf9dd9 5b2decb3

src/Python/CMakeLists.txt

+1 −2
Original line number Diff line number Diff line 
INSTALL( FILES __init__.py

         DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/TNL

         PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE )
 
         DESTINATION lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages/TNL )

src/TNL/Math.h

+2 −3
Original line number Diff line number Diff line
@@ -30,9 +30,8 @@ using both_integral_or_floating = typename std::conditional< 


// 1. If both types are integral or floating-point, the larger type is selected.

// 2. If one type is integral and the other floating-point, the floating-point type is selected.

// This is necessary only due to the limitations of nvcc. Note that clang and gcc

// can handle automatic promotion using a single-type template, exactly like

// std::min and std::max are implemented in STL.

// Casting both arguments to the same type is necessary because std::min and std::max

// are implemented as a single-type template.

template< typename T1, typename T2 >

using larger_type = typename std::conditional<

         ( both_integral_or_floating< T1, T2 >::value && sizeof(T1) >= sizeof(T2) ) ||