Skip to content

Commit 8304aaa

Browse files
committed
mkarray: move optional<T> version to the bottom
1 parent 3cf3418 commit 8304aaa

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

src/utils/mkarray.h

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -72,17 +72,6 @@ inline mxArray* make_mx_array(const std::vector<nix::Value> &v) {
7272
return data;
7373
}
7474

75-
76-
template<typename T>
77-
mxArray* make_mx_array(const boost::optional<T> &opt) {
78-
if (opt) {
79-
return make_mx_array(*opt);
80-
}
81-
else {
82-
return nullptr;
83-
}
84-
}
85-
8675
template<typename T>
8776
typename std::enable_if<std::is_arithmetic<T>::value, mxArray>::type* make_mx_array(T val) {
8877
DType2 dtype = dtype_nix2mex(nix::to_data_type<T>::value);
@@ -156,5 +145,15 @@ inline mxArray* make_mx_array(const std::vector<nix::Dimension> &dims) {
156145
return data;
157146
}
158147

148+
template<typename T>
149+
mxArray* make_mx_array(const boost::optional<T> &opt) {
150+
if (opt) {
151+
return make_mx_array(*opt);
152+
}
153+
else {
154+
return nullptr;
155+
}
156+
}
157+
159158

160159
#endif

0 commit comments

Comments
 (0)