Changeset 531 for trunk

Timestamp:

01/09/17 17:48:01 (8 years ago)

Author:

epyon

Message:

• UNSAFE trait change (32bit vs 64bit)

Location:

trunk/nv/stl/type_traits

Files:

• function.hh (modified) (1 diff)
• primary.hh (modified) (2 diffs)
• transforms.hh (modified) (1 diff)

trunk/nv/stl/type_traits/function.hh

@@ -106 +106 @@
 
 // TODO: see if const volatile are needed under MSVC - we remove them after all
-#if NV_COMPILER == NV_MSVC 
+#if NV_COMPILER == NV_MSVC && NV_ARCHITECTURE == NV_32BIT
 #define NV_EMIT_WEAK_RESULT_TYPE_CALLDECL( CALLDECL ) \
                 template < typename R, typename... Args > struct weak_result_type_impl< R CALLDECL( Args... ) > { typedef R result_type; }; \

trunk/nv/stl/type_traits/primary.hh

@@ -75 +75 @@
 
         template < typename F > struct is_function_pointer : false_type {};
-#if NV_COMPILER == NV_MSVC
+#if NV_COMPILER == NV_MSVC && NV_ARCHITECTURE == NV_32BIT
         template < typename R, typename... Args > struct is_function_pointer< R( __cdecl * )( Args... ) > : true_type{};
         template < typename R, typename... Args > struct is_function_pointer< R( __stdcall * )( Args... ) > : true_type{};
@@ -85 +85 @@
 
         template < typename C > struct is_member_function_pointer : false_type {};
-#if NV_COMPILER == NV_MSVC
+#if NV_COMPILER == NV_MSVC && NV_ARCHITECTURE == NV_32BIT
 #define NV_IS_MEMFNPTR( call_conv ) \
         template < typename R, typename C, typename... Args > struct is_member_function_pointer< R( call_conv C::* )( Args... ) > : true_type{}; \

trunk/nv/stl/type_traits/transforms.hh

@@ -246 +246 @@
 
 
-#if NV_COMPILER == NV_MSVC
+#if NV_COMPILER == NV_MSVC && NV_ARCHITECTURE == NV_32BIT
         template < typename F, typename... Args >
         struct result_of < F __cdecl ( Args... ) > { typedef decltype( invoke( declval<F>(), declval<Args>()... ) ) type; };