Changeset 382 for trunk/nv/stl/traits/alignment.hh

Timestamp:

06/01/15 20:39:35 (10 years ago)

Author:

epyon

Message:

• massive C++11 update (upgrade to MSVC 2015)
• array/dynamic_array - fully based on memory containers (will be moved) (in progress)

File:

• trunk/nv/stl/traits/alignment.hh (modified) (5 diffs)

trunk/nv/stl/traits/alignment.hh

@@ -86 +86 @@
         using aligned_array_t = typename aligned_array< T, Size, Align >::type;
 
-        template< size_t Size, size_t Align = NV_ALIGN_OF( max_align_t ) >
+        template< size_t Size, size_t Align = alignof( max_align_t ) >
         struct aligned_storage
         {
@@ -95 +95 @@
         };
 
-        template< size_t Size, size_t Align = NV_ALIGN_OF( max_align_t ) >
+        template< size_t Size, size_t Align = alignof( max_align_t ) >
         using aligned_storage_t = typename aligned_storage<Size, Align>::type;
 
@@ -106 +106 @@
                 struct size_max < >
                 {
-                        static const size_t value = 0;
+                        static constexpr size_t value = 0;
                 };
 
@@ -112 +112 @@
                 struct size_max < Size >
                 {
-                        static const size_t value = Size;
+                        static constexpr size_t value = Size;
                 };
 
@@ -122 +122 @@
         struct aligned_union
         {
-                static const size_t max_length = detail::size_max < Size, sizeof( Types )... >::value;
-                static const size_t alignment_value = detail::size_max < alignment_of< Types >::value... >::value;
+                static constexpr size_t max_length = detail::size_max < Size, sizeof( Types )... >::value;
+                static constexpr size_t alignment_value = detail::size_max < alignment_of< Types >::value... >::value;
                 struct type
                 {