Skip to content

Commit

Permalink
Update Doxygen to 1.10 (#2253)
Browse files Browse the repository at this point in the history
Update Doxygen to 1.10 and fix some documentation issues that popped up with the new version.
  • Loading branch information
dweindl authored Jan 4, 2024
1 parent da93984 commit 7ac47c2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
8 changes: 8 additions & 0 deletions include/amici/misc.h
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,10 @@ class CpuTimer {
return d_milliseconds(clock::now() - start_).count();
}

/**
* @brief Whether the timer uses a thread clock (i.e. provides proper,
* thread-specific CPU time).
*/
static bool const uses_thread_clock = true;

private:
Expand Down Expand Up @@ -329,6 +333,10 @@ class CpuTimer {
/ CLOCKS_PER_SEC;
}

/**
* @brief Whether the timer uses a thread clock (i.e. provides proper,
* thread-specific CPU time).
*/
static bool const uses_thread_clock = false;

private:
Expand Down
7 changes: 4 additions & 3 deletions include/amici/solver.h
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,8 @@ class Solver {
public:
/** Type of what is passed to Sundials solvers as user_data */
using user_data_type = std::pair<Model*, Solver const*>;

/** Type of the function to free a raw sundials solver pointer */
using free_solver_ptr = std::function<void(void*)>;
/**
* @brief Default constructor
*/
Expand Down Expand Up @@ -1608,10 +1609,10 @@ class Solver {
void applySensitivityTolerances() const;

/** pointer to solver memory block */
mutable std::unique_ptr<void, std::function<void(void*)>> solver_memory_;
mutable std::unique_ptr<void, free_solver_ptr> solver_memory_;

/** pointer to solver memory block */
mutable std::vector<std::unique_ptr<void, std::function<void(void*)>>>
mutable std::vector<std::unique_ptr<void,free_solver_ptr>>
solver_memory_B_;

/** Sundials user_data */
Expand Down
2 changes: 1 addition & 1 deletion scripts/downloadAndBuildDoxygen.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ DOXYGEN_DIR="${AMICI_PATH}"/ThirdParty/doxygen
cd "${AMICI_PATH}"/ThirdParty
if [[ ! -d ${DOXYGEN_DIR} ]]; then
git clone --single-branch \
--branch Release_1_9_7 \
--branch Release_1_10_0 \
--depth 1 \
-c advice.detachedHead=false \
https://github.com/doxygen/doxygen.git "${DOXYGEN_DIR}"
Expand Down

0 comments on commit 7ac47c2

Please sign in to comment.