Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
cburstedde committed Oct 11, 2023
2 parents f08e3bf + aee0bf1 commit 2188699
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions doc/author_markert.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
I place my contributions to p4est under the FreeBSD license. Johannes Markert ([email protected])
6 changes: 6 additions & 0 deletions src/p4est_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,12 @@ p4est_is_initialized (void)
return p4est_initialized;
}

int
p4est_get_package_id (void)
{
return p4est_package_id;
}

#ifndef __cplusplus
#undef P4EST_GLOBAL_LOGF
#undef P4EST_LOGF
Expand Down
6 changes: 6 additions & 0 deletions src/p4est_base.h
Original file line number Diff line number Diff line change
Expand Up @@ -358,6 +358,12 @@ void p4est_init (sc_log_handler_t log_handler,
*/
int p4est_is_initialized (void);

/** Query the package identity as registered in libsc.
* \return This is -1 before \ref p4est_init has been called
* and a proper package identifier (>= 0) afterwards.
*/
int p4est_get_package_id (void);

/** Compute hash value for two p4est_topidx_t integers.
* \param [in] tt Array of (at least) two values.
* \return An unsigned hash value.
Expand Down

0 comments on commit 2188699

Please sign in to comment.