From 658e4f5bff7350d8358d8d7ab71b8046a644a33c Mon Sep 17 00:00:00 2001 From: "Christopher J. Morrone" Date: Mon, 5 Feb 2018 15:54:03 -0800 Subject: [PATCH] kvs: Change "namespace" to "name_space" in external header "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. --- src/common/libkvs/kvs.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/common/libkvs/kvs.h b/src/common/libkvs/kvs.h index 927fba8759d6..18d9f5930fbb 100644 --- a/src/common/libkvs/kvs.h +++ b/src/common/libkvs/kvs.h @@ -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