Fixed more compilation errors.

mCRL2org · Dec 5, 2023 · ac66d9c · ac66d9c
1 parent abcca48
commit ac66d9c
Show file tree

Hide file tree

Showing 8 changed files with 1 addition and 347 deletions.
diff --git a/libraries/atermpp/benchmark/benchmark_shared.h b/libraries/atermpp/benchmark/benchmark_shared.h
@@ -40,45 +40,6 @@ void benchmark_threads(std::size_t number_of_threads, F f)
   std::cerr << "time: " << timer.seconds() << std::endl;
 }
 
-/// \brief Create a nested function application f_depth. Where f_0 = c and f_i = f(f_i-1,...,f_i-1).
-template<bool with_converter = false>
-aterm_appl create_nested_function(const std::string& function_name,  const std::string& leaf_name, std::size_t number_of_arguments, std::size_t depth)
-{
-  // Create a suitable function application.
-  function_symbol f(function_name, number_of_arguments);
-  function_symbol c(leaf_name, 0);
-
-  aterm_appl c_term(c);
-
-  // Initialize a wide function application.
-  std::vector<aterm> arguments(f.arity());
-  for (std::size_t i = 0; i < arguments.size(); ++i)
-  {
-    arguments[i] = c_term;
-  }
-  aterm_appl f_term(f, arguments.begin(), arguments.end());
-
-  for (std::size_t j = 0; j < depth; ++j)
-  {
-    // Create a very wide nested function application
-    for (std::size_t k = 0; k < arguments.size(); ++k)
-    {
-      arguments[k] = f_term;
-    }
-
-    if (with_converter)
-    {      
-      make_term_appl(f_term, f, arguments.begin(), arguments.end(), detail::do_not_convert_term<aterm>());
-    }
-    else
-    {
-      make_term_appl(f_term, f, arguments.begin(), arguments.end());
-    }
-  }
-
-  return f_term;
-}
-
 /// \brief Create a nested function application f_depth. Where f_0 = c and f_i = f(f_i-1,...,f_i-1).
 ///        However, this function uses the fixed arity constructor of length N which should be faster.
 template<std::size_t N>

diff --git a/libraries/atermpp/benchmark/function_application_creation.cpp b/libraries/atermpp/benchmark/function_application_creation.cpp
diff --git a/libraries/atermpp/benchmark/function_application_with_converter_creation.cpp b/libraries/atermpp/benchmark/function_application_with_converter_creation.cpp
diff --git a/libraries/atermpp/benchmark/function_symbol_creation.cpp b/libraries/atermpp/benchmark/function_symbol_creation.cpp
diff --git a/libraries/atermpp/benchmark/garbage_collection_all.cpp b/libraries/atermpp/benchmark/garbage_collection_all.cpp
diff --git a/libraries/atermpp/benchmark/garbage_collection_partial.cpp b/libraries/atermpp/benchmark/garbage_collection_partial.cpp
diff --git a/libraries/atermpp/benchmark/integer_term_creation.cpp b/libraries/atermpp/benchmark/integer_term_creation.cpp
diff --git a/libraries/pbes/include/mcrl2/pbes/pbesinst_structure_graph2.h b/libraries/pbes/include/mcrl2/pbes/pbesinst_structure_graph2.h
@@ -560,7 +560,7 @@ class pbesinst_structure_graph_algorithm2: public pbesinst_structure_graph_algor
     void on_discovered_elements(const std::set<propositional_variable_instantiation>& elements) override
     {
       using utilities::detail::contains;
-      stopwatch timer;
+      mcrl2::utilities::stopwatch timer;
 
       bool report = false;
       if (m_options.optimization == 3)