[mlpack-svn] r11128 - in mlpack/trunk/src/mlpack: methods/neighbor_search methods/neighbor_search/sort_policies tests

fastlab-svn at coffeetalk-1.cc.gatech.edu fastlab-svn at coffeetalk-1.cc.gatech.edu
Tue Jan 17 14:54:01 EST 2012


Author: jcline3
Date: 2012-01-17 14:54:00 -0500 (Tue, 17 Jan 2012)
New Revision: 11128

Modified:
   mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search.hpp
   mlpack/trunk/src/mlpack/methods/neighbor_search/sort_policies/furthest_neighbor_sort.hpp
   mlpack/trunk/src/mlpack/methods/neighbor_search/sort_policies/nearest_neighbor_sort.hpp
   mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp
Log:
non-class type return values are non-modifiable, const qualifier is ignored (-Wignored-qualifiers)

ex:
int func() { return 0; }
main() { func() = 5; } // invalid




Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search.hpp	2012-01-17 19:41:44 UTC (rev 11127)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/neighbor_search.hpp	2012-01-17 19:54:00 UTC (rev 11128)
@@ -59,7 +59,7 @@
       : bound(SortPolicy::WorstDistance()) { }
 
   //! Get the bound.
-  const double Bound() const { return bound; }
+  double Bound() const { return bound; }
   //! Modify the bound.
   double& Bound() { return bound; }
 };

Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/sort_policies/furthest_neighbor_sort.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/sort_policies/furthest_neighbor_sort.hpp	2012-01-17 19:41:44 UTC (rev 11127)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/sort_policies/furthest_neighbor_sort.hpp	2012-01-17 19:54:00 UTC (rev 11128)
@@ -77,7 +77,7 @@
    *
    * @return 0
    */
-  static inline const double WorstDistance() { return 0; }
+  static inline double WorstDistance() { return 0; }
 
   /**
    * Return what should represent the best possible distance with this
@@ -86,7 +86,7 @@
    *
    * @return DBL_MAX
    */
-  static inline const double BestDistance() { return DBL_MAX; }
+  static inline double BestDistance() { return DBL_MAX; }
 };
 
 }; // namespace neighbor

Modified: mlpack/trunk/src/mlpack/methods/neighbor_search/sort_policies/nearest_neighbor_sort.hpp
===================================================================
--- mlpack/trunk/src/mlpack/methods/neighbor_search/sort_policies/nearest_neighbor_sort.hpp	2012-01-17 19:41:44 UTC (rev 11127)
+++ mlpack/trunk/src/mlpack/methods/neighbor_search/sort_policies/nearest_neighbor_sort.hpp	2012-01-17 19:54:00 UTC (rev 11128)
@@ -81,7 +81,7 @@
    *
    * @return DBL_MAX
    */
-  static inline const double WorstDistance() { return DBL_MAX; }
+  static inline double WorstDistance() { return DBL_MAX; }
 
   /**
    * Return what should represent the best possible distance with this
@@ -90,7 +90,7 @@
    *
    * @return 0.0
    */
-  static inline const double BestDistance() { return 0.0; }
+  static inline double BestDistance() { return 0.0; }
 };
 
 }; // namespace neighbor

Modified: mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp
===================================================================
--- mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp	2012-01-17 19:41:44 UTC (rev 11127)
+++ mlpack/trunk/src/mlpack/tests/save_restore_utility_test.cpp	2012-01-17 19:54:00 UTC (rev 11128)
@@ -45,7 +45,7 @@
     return success;
   }
 
-  const size_t AnInt() { return anInt; }
+  size_t AnInt() { return anInt; }
   void AnInt(size_t s) { this->anInt = s; }
 };
 




More information about the mlpack-svn mailing list