aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-10-05 14:15:41 -0700
committerGravatar Benoit Steiner <benoit.steiner.goog@gmail.com>2016-10-05 14:15:41 -0700
commitc84084c0c0397027d97a3775c068f380bd2cb485 (patch)
treecb324ea10595c2c52cb07446b747641ab4716cea
parent422530946f437b6cfb73a09d3932bc0f3ac8af80 (diff)
Fixed compilation warning
-rw-r--r--unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h
index 6ffa1f5cc..b540b722e 100644
--- a/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h
+++ b/unsupported/Eigen/CXX11/src/Tensor/TensorTraits.h
@@ -28,7 +28,7 @@ class compute_tensor_flags
#else
0
#endif
- ||
+ |
#if EIGEN_MAX_ALIGN_BYTES>0
is_dynamic_size_storage
#else