Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove dependency on boost::array #102

Merged
merged 1 commit into from
Jun 24, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,6 @@ install:
- git submodule --quiet update --init tools/boostdep
## Direct
- git submodule --quiet update --init libs/algorithm
- git submodule --quiet update --init libs/array
- git submodule --quiet update --init libs/bind
- git submodule --quiet update --init libs/concept_check
- git submodule --quiet update --init libs/config
Expand All @@ -176,6 +175,7 @@ install:
- git submodule --quiet update --init libs/type_traits
## Transitive
- git submodule --quiet update --init libs/assert
- git submodule --quiet update --init libs/array
- git submodule --quiet update --init libs/atomic
- git submodule --quiet update --init libs/chrono
- git submodule --quiet update --init libs/container
Expand Down
6 changes: 3 additions & 3 deletions include/boost/gil/extension/numeric/kernel.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@

#include <cstddef>
#include <cassert>
#include <array>
#include <algorithm>
#include <vector>
#include <memory>

#include <boost/array.hpp>
#include <boost/gil/gil_config.hpp>
#include <boost/gil/utilities.hpp>

Expand Down Expand Up @@ -76,8 +76,8 @@ class kernel_1d : public detail::kernel_1d_adaptor<std::vector<T,Alloc> > {

/// \brief static-size kernel
template <typename T,std::size_t Size>
class kernel_1d_fixed : public detail::kernel_1d_adaptor<array<T,Size> > {
typedef detail::kernel_1d_adaptor<array<T,Size> > parent_t;
class kernel_1d_fixed : public detail::kernel_1d_adaptor<std::array<T,Size> > {
typedef detail::kernel_1d_adaptor<std::array<T,Size> > parent_t;
public:
kernel_1d_fixed() {}
explicit kernel_1d_fixed(std::size_t center_in) : parent_t(center_in) {}
Expand Down
1 change: 0 additions & 1 deletion include/boost/gil/io/base.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
#include <istream>
#include <vector>

#include <boost/array.hpp>
#include <boost/bind.hpp>
#include <boost/type_traits/is_base_of.hpp>

Expand Down
4 changes: 3 additions & 1 deletion include/boost/gil/io/bit_operations.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@

#include <boost/bind.hpp>

#include <array>

namespace boost { namespace gil { namespace detail {

// 1110 1100 -> 0011 0111
Expand Down Expand Up @@ -110,7 +112,7 @@ struct mirror_bits< Buffer

bool _apply_operation;

array< byte_t, 256 > _lookup;
std::array< byte_t, 256 > _lookup;
};


Expand Down