mirror/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout.git synced 2024-12-23 21:25:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix cxx14 sort

Browse source
This commit is contained in:
bolero-MURAKAMI 2014-01-07 23:45:09 +09:00
parent 8b40dfd184
commit 49f4e1c72e
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
sprout/algorithm/cxx14/sort.hpp
View file

@ -12,6 +12,7 @@
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/algorithm/min_element.hpp> #include <sprout/algorithm/min_element.hpp>
#include <sprout/functional/less.hpp> #include <sprout/functional/less.hpp>
#include <sprout/type_traits/integral_constant.hpp>
#include <sprout/type_traits/std_type_traits.hpp> #include <sprout/type_traits/std_type_traits.hpp>
#include <sprout/utility/swap.hpp> #include <sprout/utility/swap.hpp>
#include <sprout/utility/move.hpp> #include <sprout/utility/move.hpp>
@ -187,7 +188,7 @@ namespace sprout {
typedef typename std::decay<RandomAccessIterator>::type iterator; typedef typename std::decay<RandomAccessIterator>::type iterator;
typedef typename std::iterator_traits<iterator>::difference_type difference_type; typedef typename std::iterator_traits<iterator>::difference_type difference_type;
typedef typename std::iterator_traits<iterator>::value_type value_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 = sprout::is_trivially_copy_constructible<value_type>::value && sprout::is_trivially_copy_assignable<value_type>::value
? 30 ? 30
: 6 : 6

5
sprout/darkroom/objects/sphere.hpp
View file

@ -110,7 +110,7 @@ namespace sprout {
} }
template<typename Ray, typename Vec> template<typename Ray, typename Vec>
SPROUT_CONSTEXPR typename intersection<Ray>::type 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( return typename intersection<Ray>::type(
sprout::tuples::get<zw::does_intersect>(zwo), sprout::tuples::get<zw::does_intersect>(zwo),
sprout::tuples::get<zw::distance>(zwo), sprout::tuples::get<zw::distance>(zwo),
@ -142,8 +142,7 @@ namespace sprout {
template<typename Ray> template<typename Ray>
SPROUT_CONSTEXPR typename intersection<Ray>::type SPROUT_CONSTEXPR typename intersection<Ray>::type
intersect_5(Ray const& ray, zwo_type const& zwo, drei_type const& drei) const { intersect_5(Ray const& ray, zwo_type const& zwo, drei_type const& drei) const {
return intersect_6( return intersect_6<Ray>(
ray,
zwo, zwo,
drei, drei,
sprout::darkroom::coords::dot(sprout::tuples::get<dr::normal>(drei), sprout::darkroom::rays::direction(ray)) > 0, sprout::darkroom::coords::dot(sprout::tuples::get<dr::normal>(drei), sprout::darkroom::rays::direction(ray)) > 0,