Hunting down the last useless calls to set_is_malloc_allowed

fdarricau · fdarricau · commit 44236c021a50 · 2015-04-14T14:40:21.000+09:00
diff --git a/include/roboptim/core/sum-of-c1-squares.hxx b/include/roboptim/core/sum-of-c1-squares.hxx
@@ -62,10 +62,6 @@ namespace roboptim {
   void GenericSumOfC1Squares<T>::
   impl_compute(result_ref result, const_argument_ref x) const
   {
-#ifndef ROBOPTIM_DO_NOT_CHECK_ALLOCATION
-    set_is_malloc_allowed (true);
-#endif //! ROBOPTIM_DO_NOT_CHECK_ALLOCATION
-
     computeFunction (x);
     value_type sumSquares = 0;
     for (typename result_t::Index i = 0; i < value_.size(); i++) {
@@ -80,10 +76,6 @@ namespace roboptim {
   impl_gradient(gradient_ref gradient, const_argument_ref x,
                 size_type ROBOPTIM_DEBUG_ONLY (row)) const
   {
-#ifndef ROBOPTIM_DO_NOT_CHECK_ALLOCATION
-    set_is_malloc_allowed (true);
-#endif //! ROBOPTIM_DO_NOT_CHECK_ALLOCATION
-
     assert (row == 0);
     computeFunction (x);
     gradient.setZero ();
diff --git a/tests/sum-of-c1-squares.cc b/tests/sum-of-c1-squares.cc
@@ -65,12 +65,10 @@ BOOST_AUTO_TEST_CASE (sum_of_c1_squares)
   boost::shared_ptr<boost::test_tools::output_test_stream>
     output = retrievePattern ("sum-of-c1-squares");
 
-  Null null;
-  NoTitle notitle;
   boost::shared_ptr<Null> Nullptr =
-    boost::make_shared<Null>(null);
+    boost::make_shared<Null>();
   boost::shared_ptr<NoTitle> NoTitleptr =
-    boost::make_shared<NoTitle>(notitle);
+    boost::make_shared<NoTitle>();
 
   SumOfC1Squares NullSum(Nullptr, "null");
   SumOfC1Squares NoTitleSum(NoTitleptr, "no title");
@@ -91,8 +89,8 @@ BOOST_AUTO_TEST_CASE (sum_of_c1_squares)
   (*output) << NullSum.getName () << std::endl
 	    << NoTitleSum.getName () << std::endl;
 
-  (*output) << NullSum.isValidResult (null (x)) << std::endl
-	    << NoTitleSum.isValidResult (notitle (x)) << std::endl;
+  (*output) << NullSum.isValidResult (NullSum (x)) << std::endl
+	    << NoTitleSum.isValidResult (NoTitleSum (x)) << std::endl;
 
   (*output) << NullSum (x) << std::endl
 	    << NoTitleSum (x) << std::endl;
