Skip to content

Commit

Permalink
kvs: Change "namespace" to "name_space" in external header
Browse files Browse the repository at this point in the history
"namespace" is a keyword in C++, so flux will want to avoid using
that in public headers.  We change the function parameter name
in kvs.h from "namespace" to "name_space" to reallow C++ linkage.
  • Loading branch information
morrone committed Feb 9, 2018
1 parent 7ce22e2 commit 658e4f5
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions src/common/libkvs/kvs.h
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,13 @@ enum {
* Garbage collection will happen in the background and the
* namespace will official be removed. The removal is "eventually
* consistent".
*
* NOTE: Take care to avoid conflicting with C++'s keyword "namespace"
* in the external interfaces.
*/
flux_future_t *flux_kvs_namespace_create (flux_t *h, const char *namespace,
flux_future_t *flux_kvs_namespace_create (flux_t *h, const char *name_space,
uint32_t owner, int flags);
flux_future_t *flux_kvs_namespace_remove (flux_t *h, const char *namespace);
flux_future_t *flux_kvs_namespace_remove (flux_t *h, const char *name_space);

/* Namespace Selection
* - configure a KVS namespace to use in all kvs operations using this
Expand Down

0 comments on commit 658e4f5

Please sign in to comment.