diff options
Diffstat (limited to 'pom.h')
| -rw-r--r-- | pom.h | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -14,9 +14,11 @@ /// have certainly read their keys before calling it). /// /// If C11 atomics are not available, you can almost certainly still get away -/// with sharing configurations across threads. +/// with sharing configurations across threads, as long as you use proper +/// synchronization for \ref pom_conf_next_unread_key. /// (Essentially, libpom may end up writing the same value to the same address -/// from separate threads, which will likely never be an issue on any real machine.) +/// from separate threads, which is *technically* undefined behaviour, but will +/// likely never be an issue on any real machine.) /// Even if you are extremely paranoid, you can still use /// distinct configurations in different threads without worry. @@ -425,7 +427,9 @@ POM__MUST_USE_R; /// is called, so if you are repeatedly calling this function (unlikely, but who knows), /// you should make a copy of `conf` after each call (with \ref pom_conf_copy), /// then free the old value of `conf`. -void +/// +/// Returns `false` on out-of-memory, in which case `conf` is unchanged. +bool pom_conf_merge(pom_conf *conf, const pom_conf *other); /// Get all unread keys in `conf`. |