Changeset 488 for trunk

Timestamp:

03/08/16 08:08:06 (9 years ago)

Author:

epyon

Message:

 

File:

• trunk/nv/stl/math/basic.hh (modified) (3 diffs)

trunk/nv/stl/math/basic.hh

@@ -305 +305 @@
 
                 template < typename T, typename enable_if< is_floating_point<T>::value >::type* = nullptr >
-                constexpr T smoothstep( T edge0, T edge1, T x )
+                /*constexpr*/ T smoothstep( T edge0, T edge1, T x )
                 {
                         T y( clamp( ( x - edge0 ) / ( edge1 - edge0 ), static_cast<T>( 0 ), static_cast<T>( 1 ) ) );
@@ -312 +312 @@
 
                 template < typename T, typename enable_if< is_fp_vec<T>::value >::type* = nullptr >
-                constexpr T smoothstep( const T& edge0, const T& edge1, const T& x )
+                /*constexpr*/ T smoothstep( const T& edge0, const T& edge1, const T& x )
                 {
                         T y( clamp( ( x - edge0 ) / ( edge1 - edge0 ), static_cast<T>( 0 ), static_cast<T>( 1 ) ) );
@@ -319 +319 @@
 
                 template < typename T, typename enable_if< is_fp_vec<T>::value >::type* = nullptr >
-                constexpr T smoothstep( value_type_t<T> edge0, value_type_t<T> edge1, const T& x )
+                /*constexpr*/ T smoothstep( value_type_t<T> edge0, value_type_t<T> edge1, const T& x )
                 {
                         T y( clamp( ( x - edge0 ) / ( edge1 - edge0 ), static_cast<T>( 0 ), static_cast<T>( 1 ) ) );