Changeset 446

Timestamp:

07/30/15 12:08:39 (10 years ago)

Author:

epyon

Message:

• stl/algorithm/heap - heap functions
• stl/priority_queue - priority_queue implementation
• minor cleanup for type_traits/experimental

Location:

trunk/nv/stl

Files:

• algorithm.hh (modified) (1 diff)
• algorithm/heap.hh (added)
• priority_queue.hh (added)
• type_traits/experimental.hh (modified) (1 diff)

trunk/nv/stl/algorithm.hh

@@ -18 +18 @@
 #include <nv/stl/algorithm/copy.hh>
 #include <nv/stl/algorithm/fill.hh>
+#include <nv/stl/algorithm/heap.hh>
 #include <nv/stl/utility.hh>
 #include <nv/stl/iterator.hh>

trunk/nv/stl/type_traits/experimental.hh

@@ -44 +44 @@
 #if NV_COMPILER == NV_MSVC
 #define NV_VOID_DECLTYPE( EXPR ) ::nv::match_ptr_t< &EXPR >
+#else
+#define NV_VOID_DECLTYPE( EXPR ) decltype( EXPR )
+#endif
 #define NV_GENERATE_HAS_MEMBER( MEMBER ) \
 template< typename, typename = nv::void_t<> > struct has_##MEMBER##_member : nv::false_type {}; \
 template< typename T > struct has_##MEMBER##_member <T, nv::void_t< NV_VOID_DECLTYPE( T::MEMBER ) > > : true_type{};
-#else
-#define NV_VOID_DECLTYPE( EXPR ) decltype( EXPR )
-#define NV_GENERATE_HAS_MEMBER( MEMBER ) \
-template< typename, typename = nv::void_t<> > struct has_##MEMBER##_member : nv::false_type {}; \
-template< typename T > struct has_##MEMBER##_member <T, nv::void_t< NV_VOID_DECLTYPE( T::MEMBER ) > > : true_type{};
-#endif
 
 namespace nv