Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Martin Reinecke
ducc
Commits
338ca14b
Commit
338ca14b
authored
Apr 16, 2020
by
Martin Reinecke
Browse files
tweak
parent
cc14cdac
Pipeline
#72986
passed with stages
in 8 minutes and 36 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
src/mr_util/infra/mav.h
View file @
338ca14b
...
@@ -27,7 +27,7 @@
...
@@ -27,7 +27,7 @@
#include
<vector>
#include
<vector>
#include
<memory>
#include
<memory>
#include
"mr_util/infra/error_handling.h"
#include
"mr_util/infra/error_handling.h"
#define _MSC_VER
namespace
mr
{
namespace
mr
{
namespace
detail_mav
{
namespace
detail_mav
{
...
@@ -114,6 +114,7 @@ template<typename T> class membuf
...
@@ -114,6 +114,7 @@ template<typename T> class membuf
membuf
(
const
membuf
&
other
)
membuf
(
const
membuf
&
other
)
:
ptr
(
other
.
ptr
),
d
(
other
.
d
),
rw
(
false
)
{}
:
ptr
(
other
.
ptr
),
d
(
other
.
d
),
rw
(
false
)
{}
#if defined(_MSC_VER)
#if defined(_MSC_VER)
// MSVC is broken
membuf
(
membuf
&
other
)
membuf
(
membuf
&
other
)
:
ptr
(
other
.
ptr
),
d
(
other
.
d
),
rw
(
other
.
rw
)
{}
:
ptr
(
other
.
ptr
),
d
(
other
.
d
),
rw
(
other
.
rw
)
{}
membuf
(
membuf
&&
other
)
membuf
(
membuf
&&
other
)
...
@@ -160,6 +161,7 @@ template<typename T> class fmav: public fmav_info, public membuf<T>
...
@@ -160,6 +161,7 @@ template<typename T> class fmav: public fmav_info, public membuf<T>
:
fmav_info
(
info
),
membuf
<
T
>
(
d_
)
{}
:
fmav_info
(
info
),
membuf
<
T
>
(
d_
)
{}
fmav
(
const
fmav
&
other
)
=
default
;
fmav
(
const
fmav
&
other
)
=
default
;
#if defined(_MSC_VER)
#if defined(_MSC_VER)
// MSVC is broken
fmav
(
fmav
&
other
)
:
fmav_info
(
other
),
membuf
<
T
>
(
other
)
{}
fmav
(
fmav
&
other
)
:
fmav_info
(
other
),
membuf
<
T
>
(
other
)
{}
fmav
(
fmav
&&
other
)
:
fmav_info
(
other
),
membuf
<
T
>
(
other
)
{}
fmav
(
fmav
&&
other
)
:
fmav_info
(
other
),
membuf
<
T
>
(
other
)
{}
#else
#else
...
@@ -332,6 +334,7 @@ template<typename T, size_t ndim> class mav: public mav_info<ndim>, public membu
...
@@ -332,6 +334,7 @@ template<typename T, size_t ndim> class mav: public mav_info<ndim>, public membu
:
mav_info
<
ndim
>
(
shp_
),
membuf
<
T
>
(
size
())
{}
:
mav_info
<
ndim
>
(
shp_
),
membuf
<
T
>
(
size
())
{}
mav
(
const
mav
&
other
)
=
default
;
mav
(
const
mav
&
other
)
=
default
;
#if defined(_MSC_VER)
#if defined(_MSC_VER)
// MSVC is broken
mav
(
mav
&
other
)
:
mav_info
<
ndim
>
(
other
),
membuf
<
T
>
(
other
)
{}
mav
(
mav
&
other
)
:
mav_info
<
ndim
>
(
other
),
membuf
<
T
>
(
other
)
{}
mav
(
mav
&&
other
)
:
mav_info
<
ndim
>
(
other
),
membuf
<
T
>
(
other
)
{}
mav
(
mav
&&
other
)
:
mav_info
<
ndim
>
(
other
),
membuf
<
T
>
(
other
)
{}
#else
#else
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment