Switch aliases to classes (#550)

src/ngraph/axis_set.hpp

@@ -21,7 +21,6 @@
 
 namespace ngraph
 {
-#ifdef NO_GLOBAL_TYPE_ALIASES
     /// \brief A set of axes.
     class AxisSet : public std::set<size_t>
     {
@@ -54,8 +53,4 @@ namespace ngraph
             return *this;
         }
     };
-#else
-    // Deprecated definition
-    using AxisSet = std::set<size_t>;
-#endif
 }

src/ngraph/axis_vector.hpp

@@ -21,7 +21,6 @@
 
 namespace ngraph
 {
-#ifdef NO_GLOBAL_TYPE_ALIASES
     /// \brief A vector of axes.
     class AxisVector : public std::vector<size_t>
     {
@@ -64,8 +63,4 @@ namespace ngraph
             return *this;
         }
     };
-#else
-    // Deprecated definition
-    using AxisVector = std::vector<size_t>;
-#endif
 }

src/ngraph/coordinate.hpp

@@ -24,7 +24,6 @@
 
 namespace ngraph
 {
-#ifdef NO_GLOBAL_TYPE_ALIASES
     /// \brief Coordinates for a tensor element
     class Coordinate : public std::vector<size_t>
     {
@@ -73,10 +72,6 @@ namespace ngraph
             return *this;
         }
     };
-#else
-    // Deprecated definition
-    using Coordinate = std::vector<size_t>;
-#endif
 
     // Removes some values from a vector of axis values
     template <typename AXIS_VALUES>

src/ngraph/coordinate_diff.hpp

@@ -21,7 +21,6 @@
 
 namespace ngraph
 {
-#ifdef NO_GLOBAL_TYPE_ALIASES
     /// \brief A difference (signed) of tensor element coordinates.
     class CoordinateDiff : public std::vector<std::ptrdiff_t>
     {
@@ -64,8 +63,4 @@ namespace ngraph
             return *this;
         }
     };
-#else
-    // Deprecated definition
-    using CoordinateDiff = std::vector<std::ptrdiff_t>;
-#endif
 }

src/ngraph/node_vector.hpp

@@ -23,8 +23,6 @@ namespace ngraph
 {
     class Node;
 
-#ifdef NO_GLOBAL_TYPE_ALIASES
-
     /// \brief Zero or more nodes.
     class NodeVector : public std::vector<std::shared_ptr<Node>>
     {
@@ -46,10 +44,4 @@ namespace ngraph
 
         NodeVector() {}
     };
-
-#else
-    // Deprecated definitions
-    using NodeVector = std::vector<std::shared_ptr<Node>>;
-    using Nodes = NodeVector;
-#endif
 }

src/ngraph/ops/parameter_vector.hpp

@@ -24,8 +24,6 @@ namespace ngraph
     {
         class Parameter;
 
-#ifdef NO_GLOBAL_TYPE_ALIASES
-
         /// \brief Zero or more nodes.
         class ParameterVector : public std::vector<std::shared_ptr<op::Parameter>>
         {
@@ -47,11 +45,5 @@ namespace ngraph
 
             ParameterVector() {}
         };
-
-#else
-        // Deprecated definitions
-        using ParameterVector = std::vector<std::shared_ptr<op::Parameter>>;
-        using Parameters = ParameterVector;
-#endif
     }
 }

src/ngraph/shape.hpp

@@ -25,7 +25,6 @@
 
 namespace ngraph
 {
-#ifdef NO_GLOBAL_TYPE_ALIASES
     /// \brief Shape for a tensor.
     class Shape : public std::vector<size_t>
     {
@@ -68,10 +67,6 @@ namespace ngraph
             return *this;
         }
     };
-#else
-    // Deprecated definition
-    using Shape = std::vector<size_t>;
-#endif
 
     /// Number of elements in spanned by a shape
     size_t shape_size(const Shape& shape);

src/ngraph/strides.hpp

@@ -20,7 +20,6 @@
 
 namespace ngraph
 {
-#ifdef NO_GLOBAL_TYPE_ALIASES
     /// \brief Strides for a tensor.
     class Strides : public std::vector<size_t>
     {
@@ -63,8 +62,4 @@ namespace ngraph
             return *this;
         }
     };
-#else
-    // Deprecated definition
-    using Strides = std::vector<size_t>;
-#endif
 }