Solve deprecated warning issues with GCC-5

roboptim · Dec 21, 2016 · bda5afc · bda5afc
1 parent 1871113
commit bda5afc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/include/roboptim/core/problem.hh b/include/roboptim/core/problem.hh
@@ -238,12 +238,12 @@ namespace roboptim
     /// \brief Retrieve arguments scaling (deprecated version).
     ///
     /// \deprecated Deprecated since version 3.1. Use argumentScaling() instead.
-    ROBOPTIM_CORE_DEPRECATED scales_t& argumentScales ();
+    ROBOPTIM_CORE_DEPRECATED scaling_t& argumentScales ();
 
     /// \brief Retrieve arguments scaling (deprecated version).
     ///
     /// \deprecated Deprecated since version 3.1. Use argumentScaling() instead.
-    ROBOPTIM_CORE_DEPRECATED const scales_t& argumentScales () const;
+    ROBOPTIM_CORE_DEPRECATED const scaling_t& argumentScales () const;
 
     /// \brief Retrieve arguments names.
     /// Arguments names define a name for each argument. This is particularly
@@ -309,7 +309,7 @@ namespace roboptim
     /// \brief Retrieve constraints scaling vector (deprecated version).
     ///
     /// \deprecated Deprecated since version 3.1. Use scalingVector() instead.
-    ROBOPTIM_CORE_DEPRECATED const scalesVect_t& scalesVector () const;
+    ROBOPTIM_CORE_DEPRECATED const scalingVect_t& scalesVector () const;
 
     /// \brief Return the output size of the problem's constraints.
     size_type constraintsOutputSize () const;

diff --git a/include/roboptim/core/problem.hxx b/include/roboptim/core/problem.hxx
@@ -348,7 +348,7 @@ namespace roboptim
   }
 
   template <typename T>
-  const typename Problem<T>::scalesVect_t&
+  const typename Problem<T>::scalingVect_t&
   Problem<T>::scalesVector () const
   {
     return scalingVector ();
@@ -383,14 +383,14 @@ namespace roboptim
   }
 
   template <typename T>
-  typename Problem<T>::scales_t&
+  typename Problem<T>::scaling_t&
   Problem<T>::argumentScales ()
   {
     return argumentScaling ();
   }
 
   template <typename T>
-  const typename Problem<T>::scales_t&
+  const typename Problem<T>::scaling_t&
   Problem<T>::argumentScales () const
   {
     return argumentScaling ();