From 49f4e1c72e6fed094d54113eb03a1d5d8ce3aa0a Mon Sep 17 00:00:00 2001
From: bolero-MURAKAMI <bolero.murakami@gmail.com>
Date: Tue, 7 Jan 2014 23:45:09 +0900
Subject: [PATCH] fix cxx14 sort

---
 sprout/algorithm/cxx14/sort.hpp    | 3 ++-
 sprout/darkroom/objects/sphere.hpp | 5 ++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/sprout/algorithm/cxx14/sort.hpp b/sprout/algorithm/cxx14/sort.hpp
index 4ac9ed15..ef14a3a6 100644
--- a/sprout/algorithm/cxx14/sort.hpp
+++ b/sprout/algorithm/cxx14/sort.hpp
@@ -12,6 +12,7 @@
 #include <sprout/config.hpp>
 #include <sprout/algorithm/min_element.hpp>
 #include <sprout/functional/less.hpp>
+#include <sprout/type_traits/integral_constant.hpp>
 #include <sprout/type_traits/std_type_traits.hpp>
 #include <sprout/utility/swap.hpp>
 #include <sprout/utility/move.hpp>
@@ -187,7 +188,7 @@ namespace sprout {
 			typedef typename std::decay<RandomAccessIterator>::type iterator;
 			typedef typename std::iterator_traits<iterator>::difference_type difference_type;
 			typedef typename std::iterator_traits<iterator>::value_type value_type;
-			SPROUT_STATIC_CONSTEXPR difference_type limit
+			difference_type const limit
 				= sprout::is_trivially_copy_constructible<value_type>::value && sprout::is_trivially_copy_assignable<value_type>::value
 				? 30
 				: 6
diff --git a/sprout/darkroom/objects/sphere.hpp b/sprout/darkroom/objects/sphere.hpp
index c53ac245..4e4ec1eb 100644
--- a/sprout/darkroom/objects/sphere.hpp
+++ b/sprout/darkroom/objects/sphere.hpp
@@ -110,7 +110,7 @@ namespace sprout {
 				}
 				template<typename Ray, typename Vec>
 				SPROUT_CONSTEXPR typename intersection<Ray>::type
-				intersect_6(Ray const& ray, zwo_type const& zwo, drei_type const& drei,bool is_from_inside, Vec const& normal) const {
+				intersect_6(zwo_type const& zwo, drei_type const& drei,bool is_from_inside, Vec const& normal) const {
 					return typename intersection<Ray>::type(
 						sprout::tuples::get<zw::does_intersect>(zwo),
 						sprout::tuples::get<zw::distance>(zwo),
@@ -142,8 +142,7 @@ namespace sprout {
 				template<typename Ray>
 				SPROUT_CONSTEXPR typename intersection<Ray>::type
 				intersect_5(Ray const& ray, zwo_type const& zwo, drei_type const& drei) const {
-					return intersect_6(
-						ray,
+					return intersect_6<Ray>(
 						zwo,
 						drei,
 						sprout::darkroom::coords::dot(sprout::tuples::get<dr::normal>(drei), sprout::darkroom::rays::direction(ray)) > 0,