update gnuplot iostream

Author: Saurav Agarwal

cppsrc/core/include/CoverageControl/extern/gnuplot/gnuplot-iostream.h

@@ -742,7 +742,7 @@ struct Error_WasNotContainer {
 
 // The unspecialized version of this class gives traits for things that are *not* arrays.
 template <typename T, typename Enable=void>
-class ArrayTraits {
+class ArrayTraitsImpl {
 public:
     // The value type of elements after all levels of nested containers have been dereferenced.
     typedef Error_WasNotContainer value_type;
@@ -765,6 +765,9 @@ class ArrayTraits {
     }
 };
 
+template <typename T>
+using ArrayTraits = ArrayTraitsImpl<typename std::remove_reference<typename std::remove_cv<T>::type>::type>;
+
 // Most specializations of ArrayTraits should inherit from this (with V set to the value type).
 // It sets some default values.
 template <typename V>
@@ -777,16 +780,6 @@ class ArrayTraitsDefaults {
     static constexpr size_t depth = ArrayTraits<V>::depth + 1;
 };
 
-// This handles reference types, such as are given with std::tie.
-// It also allows for instance "ArrayTraits<T[N]>" to match "ArrayTraits<T (&) [N]>".
-// I think this is okay to do... The alternative is to use remove_reference all over the place.
-template <typename T>
-class ArrayTraits<T&> : public ArrayTraits<T> { };
-
-// This supports gp.send1d(std::forward_as_tuple(x, std::move(y)));
-template <typename T>
-class ArrayTraits<T&&> : public ArrayTraits<T> { };
-
 // }}}2
 
 // {{{2 STL container support
@@ -833,7 +826,7 @@ class IteratorRange {
 };
 
 template <typename T>
-class ArrayTraits<T,
+class ArrayTraitsImpl<T,
     typename std::enable_if_t<is_like_stl_container<T>>
 > : public ArrayTraitsDefaults<typename T::value_type> {
 public:
@@ -845,7 +838,7 @@ class ArrayTraits<T,
 };
 
 template <typename T>
-class ArrayTraits<T,
+class ArrayTraitsImpl<T,
     typename std::enable_if_t<is_like_stl_container2<T>>
 > : public ArrayTraitsDefaults<typename std::iterator_traits<decltype(begin(std::declval<T const>()))>::value_type> {
     using IterType = decltype(begin(std::declval<T const>()));
@@ -863,7 +856,7 @@ class ArrayTraits<T,
 // {{{2 C style array support
 
 template <typename T, size_t N>
-class ArrayTraits<T[N]> : public ArrayTraitsDefaults<T> {
+class ArrayTraitsImpl<T[N]> : public ArrayTraitsDefaults<T> {
 public:
     typedef IteratorRange<const T*, T> range_type;
 
@@ -918,7 +911,7 @@ class PairOfRange {
 };
 
 template <typename T, typename U>
-class ArrayTraits<std::pair<T, U>> {
+class ArrayTraitsImpl<std::pair<T, U>> {
 public:
     typedef PairOfRange<typename ArrayTraits<T>::range_type, typename ArrayTraits<U>::range_type> range_type;
     typedef std::pair<typename ArrayTraits<T>::value_type, typename ArrayTraits<U>::value_type> value_type;
@@ -944,7 +937,7 @@ class ArrayTraits<std::pair<T, U>> {
 // {{{2 boost::tuple support
 
 template <typename T>
-class ArrayTraits<T,
+class ArrayTraitsImpl<T,
     typename std::enable_if_t<
         is_boost_tuple<T> && !is_boost_tuple_nulltype<typename T::tail_type>
     >
@@ -969,7 +962,7 @@ class ArrayTraits<T,
 };
 
 template <typename T>
-class ArrayTraits<T,
+class ArrayTraitsImpl<T,
     typename std::enable_if_t<
         is_boost_tuple<T> && is_boost_tuple_nulltype<typename T::tail_type>
     >
@@ -1015,7 +1008,7 @@ struct StdTupUnwinder<Tuple, 0> {
 };
 
 template <typename... Args>
-class ArrayTraits<std::tuple<Args...>> :
+class ArrayTraitsImpl<std::tuple<Args...>> :
     public ArrayTraits<typename StdTupUnwinder<std::tuple<Args...>, sizeof...(Args)-1>::type>
 {
     typedef std::tuple<Args...> Tuple;
@@ -2036,9 +2029,7 @@ inline Gnuplot &operator<<(Gnuplot &gp, PlotGroup &&sp) {
 
 // The first version of this library didn't use namespaces, and now this must be here forever
 // for reverse compatibility.
-// Saurav: Removed this as this causes forward declaration issues with clang
-// using gnuplotio::Gnuplot;
-using namespace gnuplotio;
+using gnuplotio::Gnuplot;
 
 #endif // GNUPLOT_IOSTREAM_H
 
@@ -2161,7 +2152,7 @@ class BlitzIterator<T, ArrayDim, 1> {
 };
 
 template <typename T, int ArrayDim>
-class ArrayTraits<blitz::Array<T, ArrayDim>> : public ArrayTraitsDefaults<T> {
+class ArrayTraitsImpl<blitz::Array<T, ArrayDim>> : public ArrayTraitsDefaults<T> {
 public:
     static constexpr bool allow_auto_unwrap = false;
     static constexpr size_t depth = ArrayTraits<T>::depth + ArrayDim;
@@ -2204,7 +2195,7 @@ template <typename T> static constexpr bool dont_treat_as_stl_container<arma::fi
 // {{{3 Cube
 
 template <typename T>
-class ArrayTraits<arma::Cube<T>> : public ArrayTraitsDefaults<T> {
+class ArrayTraitsImpl<arma::Cube<T>> : public ArrayTraitsDefaults<T> {
     class SliceRange {
     public:
         SliceRange() : p(nullptr), col(0), slice(0) { }
@@ -2374,17 +2365,17 @@ class ArrayTraits_ArmaMatOrField : public ArrayTraitsDefaults<T> {
 };
 
 template <typename T>
-class ArrayTraits<arma::field<T>> : public ArrayTraits_ArmaMatOrField<arma::field<T>, T> { };
+class ArrayTraitsImpl<arma::field<T>> : public ArrayTraits_ArmaMatOrField<arma::field<T>, T> { };
 
 template <typename T>
-class ArrayTraits<arma::Mat<T>> : public ArrayTraits_ArmaMatOrField<arma::Mat<T>, T> { };
+class ArrayTraitsImpl<arma::Mat<T>> : public ArrayTraits_ArmaMatOrField<arma::Mat<T>, T> { };
 
 // }}}3
 
 // {{{3 Row
 
 template <typename T>
-class ArrayTraits<arma::Row<T>> : public ArrayTraitsDefaults<T> {
+class ArrayTraitsImpl<arma::Row<T>> : public ArrayTraitsDefaults<T> {
 public:
     static constexpr bool allow_auto_unwrap = false;
 
@@ -2401,7 +2392,7 @@ class ArrayTraits<arma::Row<T>> : public ArrayTraitsDefaults<T> {
 // {{{3 Col
 
 template <typename T>
-class ArrayTraits<arma::Col<T>> : public ArrayTraitsDefaults<T> {
+class ArrayTraitsImpl<arma::Col<T>> : public ArrayTraitsDefaults<T> {
 public:
     static constexpr bool allow_auto_unwrap = false;
 
@@ -2564,7 +2555,7 @@ class ArrayTraits_Eigen2D : public ArrayTraitsDefaults<typename RF::value_type>
 };
 
 template <typename T>
-class ArrayTraits<T, typename std::enable_if_t<is_eigen_matrix<T>>> :
+class ArrayTraitsImpl<T, typename std::enable_if_t<is_eigen_matrix<T>>> :
     public std::conditional_t<
         T::RowsAtCompileTime == 1 || T::ColsAtCompileTime == 1,
         ArrayTraits_Eigen1D<T>,