Changeset 387 for trunk

Timestamp:

06/06/15 16:00:35 (10 years ago)

Author:

epyon

Message:

• utility - pair/make_pair, split into sub headers
• functional - function objects, reference_wrapper, ref, cref

Location:

trunk/nv/stl

Files:

• functional.hh (modified) (1 diff)
• functional/arithmetic_ops.hh (added)
• functional/bitwise_ops.hh (added)
• functional/common.hh (added)
• functional/comparisons.hh (added)
• functional/hash.hh (modified) (1 diff)
• functional/logical_ops.hh (added)
• functional/reference.hh (added)
• type_traits/transforms.hh (modified) (1 diff)
• utility (added)
• utility.hh (modified) (1 diff)
• utility/common.hh (added)
• utility/make_pair.hh (added)
• utility/pair.hh (added)

trunk/nv/stl/functional.hh

@@ -14 +14 @@
 #define NV_STL_FUNCTIONAL_HH
 
-#include <nv/core/common.hh>
+#include <nv/stl/functional/common.hh>
 #include <nv/stl/functional/hash.hh>
+#include <nv/stl/functional/reference.hh>
+#include <nv/stl/functional/bitwise_ops.hh>
+#include <nv/stl/functional/logical_ops.hh>
+#include <nv/stl/functional/arithmetic_ops.hh>
+#include <nv/stl/functional/comparisons.hh>
 
 #endif // NV_STL_TYPE_TRAITS_HH

trunk/nv/stl/functional/hash.hh

@@ -14 +14 @@
 #define NV_STL_FUNCTIONAL_HASH_HH
 
-#include <nv/core/common.hh>
+#include <nv/stl/functional/common.hh>
 #include <nv/stl/limits.hh>
 #include <nv/stl/type_traits/properties.hh>

trunk/nv/stl/type_traits/transforms.hh

@@ -201 +201 @@
                         remove_extent_t<U>*,
                         conditional_t <
-                                is_function<U>::value,
-                                add_pointer_t<U>,
-                                remove_cv_t<U>
+                        is_function<U>::value,
+                        add_pointer_t<U>,
+                        remove_cv_t<U>
                         >
                 > type;
         };
 
-        template< typename T > 
+        template< typename T >
         using decay_t = typename decay<T>::type;
 

trunk/nv/stl/utility.hh

@@ -14 +14 @@
 #define NV_STL_UTILITY_HH
 
-#include <nv/core/common.hh>
-#include <nv/stl/type_traits/common.hh>
-
-namespace nv
-{
-
-        // TODO: change to swap<T> once you get rid of STL
-        template< typename T, typename U >
-        void swap( T& x, U& y )
-        {
-                T t = move( x );
-                x = move( y );
-                y = move( t );
-        }
-
-        template < typename T >
-        inline const T& max( const T& a, const T& b )
-        {
-                return a < b ? b : a;
-        }
-
-        template < typename T >
-        inline const T& min( const T& a, const T& b )
-        {
-                return a > b ? b : a;
-        }
-
-}
+#include <nv/stl/utility/common.hh>
+#include <nv/stl/utility/pair.hh>
 
 #endif // NV_STL_UTILITY_HH