mirror of https://github.com/CGAL/cgal
Merge pull request #5469 from afabri/Box_intersection_d-array-GF
Box_intersection_d: Replace built-in array with std::array
This commit is contained in:
commit
c99be40e7a
|
|
@ -24,6 +24,7 @@
|
||||||
#include <CGAL/atomic.h>
|
#include <CGAL/atomic.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
#include <array>
|
||||||
|
|
||||||
namespace CGAL {
|
namespace CGAL {
|
||||||
|
|
||||||
|
|
@ -63,8 +64,9 @@ class Box_d;
|
||||||
template<class NT_, int N>
|
template<class NT_, int N>
|
||||||
class Box_d< NT_, N, ID_NONE> {
|
class Box_d< NT_, N, ID_NONE> {
|
||||||
protected:
|
protected:
|
||||||
NT_ lo[N];
|
std::array<NT_,N> lo;
|
||||||
NT_ hi[N];
|
std::array<NT_,N> hi;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
typedef NT_ NT;
|
typedef NT_ NT;
|
||||||
typedef std::size_t ID;
|
typedef std::size_t ID;
|
||||||
|
|
@ -72,8 +74,8 @@ public:
|
||||||
Box_d() {}
|
Box_d() {}
|
||||||
Box_d(bool complete) { init(complete); }
|
Box_d(bool complete) { init(complete); }
|
||||||
Box_d(NT l[N], NT h[N]) {
|
Box_d(NT l[N], NT h[N]) {
|
||||||
std::copy( l, l + N, lo );
|
std::copy( l, l + N, &lo[0] );
|
||||||
std::copy( h, h + N, hi );
|
std::copy( h, h + N, &hi[0] );
|
||||||
}
|
}
|
||||||
void init (bool complete = false) {
|
void init (bool complete = false) {
|
||||||
NT inf = box_limits<NT>::inf();
|
NT inf = box_limits<NT>::inf();
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue