King_DuckZ/Sprout
1
0
Fork 0
mirror of https://github.com/bolero-MURAKAMI/Sprout synced 2024-11-12 21:09:01 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1 from sscrisk/master

Browse source 
コンパイル通るようにしました
This commit is contained in:
Bolero MURAKAMI 2011-09-03 06:10:40 -07:00
commit 21f5d5191a
6 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
sprout/algorithm/fixed/make_heap.hpp
View file

@ -1,5 +1,5 @@
#ifndef SPROUT_ALGORITHM_FIXED_POP_HEAP_HPP #ifndef SPROUT_ALGORITHM_FIXED_MAKE_HEAP_HPP
#define SPROUT_ALGORITHM_FIXED_POP_HEAP_HPP #define SPROUT_ALGORITHM_FIXED_MAKE_HEAP_HPP
#include <sprout/config.hpp> #include <sprout/config.hpp>
#include <sprout/fixed_container/traits.hpp> #include <sprout/fixed_container/traits.hpp>
@ -119,4 +119,4 @@ namespace sprout {
} // namespace fixed } // namespace fixed
} // namespace sprout } // namespace sprout
#endif // #ifndef SPROUT_ALGORITHM_FIXED_POP_HEAP_HPP #endif // #ifndef SPROUT_ALGORITHM_FIXED_MAKE_HEAP_HPP

2
sprout/algorithm/fixed/make_partial_heap.hpp
View file

@ -52,7 +52,7 @@ namespace sprout {
) )
{ {
return sprout::fixed::detail::make_partial_heap_impl_1( return sprout::fixed::detail::make_partial_heap_impl_1(
sprout::fixed::detail::make_heap_impl(cont, comp, offset, middle_size), ::sprout::fixed::detail::make_heap_impl(cont, comp, offset, middle_size),
comp, comp,
offset, offset,
size, size,

2
sprout/fixed_container/fixed_size.hpp
View file

@ -12,7 +12,7 @@ namespace sprout {
template<typename Container> template<typename Container>
struct fixed_size { struct fixed_size {
public: public:
typedef typename sprout::fixed_container_traits<Container>::size_type value static SPROUT_CONSTEXPR typename sprout::fixed_container_traits<Container>::size_type value
= sprout::fixed_container_traits<Container>::fixed_size = sprout::fixed_container_traits<Container>::fixed_size
; ;
typedef std::integral_constant<typename sprout::fixed_container_traits<Container>::size_type, value> type; typedef std::integral_constant<typename sprout::fixed_container_traits<Container>::size_type, value> type;

2
sprout/range/algorithm/fixed/transform.hpp
View file

@ -20,7 +20,7 @@ namespace sprout {
UnaryOperation op UnaryOperation op
) )
{ {
return sprout::fixed::transform(sprout::begin(input), sprout::end(input), result, op)); return sprout::fixed::transform(sprout::begin(input), sprout::end(input), result, op);
} }
// //

2
sprout/range/algorithm/infit/transform.hpp
View file

@ -20,7 +20,7 @@ namespace sprout {
UnaryOperation op UnaryOperation op
) )
{ {
return sprout::infit::transform(sprout::begin(input), sprout::end(input), result, op)); return sprout::infit::transform(sprout::begin(input), sprout::end(input), result, op);
} }
// //

2
sprout/range/algorithm/outfit/transform.hpp
View file

@ -20,7 +20,7 @@ namespace sprout {
UnaryOperation op UnaryOperation op
) )
{ {
return sprout::outfit::transform(sprout::begin(input), sprout::end(input), result, op)); return sprout::outfit::transform(sprout::begin(input), sprout::end(input), result, op);
} }
// //