Bring C++ namespacing up to date

The bitset_t was once an internal implementation detail, but was made
a part of the api.  The roaring::internal namespace was still being
used on bitset_t.

This moves it to the API namespace.  Also, the `misc` namespace where
the configreport put its routines was not being included in some
places.  This fixes that.

Additionally, the roaring.h C API is put inside roaring::api in C
builds when you include it indirectly via roaring.hh, so qualified
names of api::roaring_xxx() were used in roaring.hh.  But it's
possible to do `using namespace api;` inside roaring.hh inside of
the `namespace roaring {` scope, and import the api definitions for
that namespace so that you don't have to qualify the names and yet
still don't leak them into either the global namespace or the
roaring namespace.

Finally, the various containers were being exposed as api vs. internal.
While things like the iterators are api, things like run_container_t
should be internal.

Author: AE1020

cpp/roaring/roaring.hh

@@ -28,9 +28,9 @@
 
 #include "roaring.hh"
 
-namespace roaring {
+namespace roaring {  // `using namespace` inside applies to this scope only
 
-using roaring::Roaring;
+using namespace api;  // roaring.h C APIs are put in roaring::api in C++
 
 class Roaring64MapSetBitBiDirectionalIterator;
 
@@ -40,8 +40,6 @@ typedef Roaring64MapSetBitBiDirectionalIterator
     Roaring64MapSetBitForwardIterator;
 
 class Roaring64Map {
-    typedef api::roaring_bitmap_t roaring_bitmap_t;
-
    public:
     /**
      * Create an empty bitmap
@@ -1120,7 +1118,7 @@ class Roaring64Map {
      * means that it should stop), and takes (uint64_t element, void* ptr) as
      * inputs.
      */
-    void iterate(api::roaring_iterator64 iterator, void *ptr) const {
+    void iterate(roaring_iterator64 iterator, void *ptr) const {
         for (const auto &map_entry : roarings) {
             bool should_continue =
                 roaring_iterate64(&map_entry.second.roaring, iterator,
@@ -1980,7 +1978,7 @@ class Roaring64MapSetBitBiDirectionalIterator {
     std::map<uint32_t, Roaring>::const_iterator
         map_iter{};  // The empty constructor silences warnings from pedantic
                      // static analyzers.
-    api::roaring_uint32_iterator_t
+    roaring_uint32_iterator_t
         i{};  // The empty constructor silences warnings from pedantic static
               // analyzers.
 };

cpp/roaring/roaring64map.hh

@@ -19,7 +19,7 @@
 #ifdef __cplusplus
 extern "C" {
 namespace roaring {
-namespace api {
+namespace internal {
 #endif
 
 /**
@@ -38,14 +38,20 @@ namespace api {
 extern "C++" {
 struct container_s {};
 }
-#define ROARING_CONTAINER_T ::roaring::api::container_s
+#define ROARING_CONTAINER_T ::roaring::internal::container_s
 #else
 #define ROARING_CONTAINER_T void  // no compile-time checking
 #endif
 
 #define ROARING_FLAG_COW UINT8_C(0x1)
 #define ROARING_FLAG_FROZEN UINT8_C(0x2)
 
+#ifdef __cplusplus
+}  // end namespace internal (but still in namespace roaring)
+using internal::container_s;  // use scoped to this namespace block
+namespace api {                        // begin API namespace
+#endif
+
 /**
  * Roaring arrays are array-based key-value pairs having containers as values
  * and 16-bit integer keys. A roaring bitmap  might be implemented as such.
@@ -153,7 +159,7 @@ typedef struct roaring_container_iterator_s {
 #ifdef __cplusplus
 }
 }
-}  // extern "C" { namespace roaring { namespace api {
+}  // extern "C" { namespace roaring { namespace internal {
 #endif
 
 #endif /* ROARING_TYPES_H */

include/roaring/roaring_types.h

@@ -11,7 +11,7 @@
 #ifdef __cplusplus
 extern "C" {
 namespace roaring {
-namespace internal {
+namespace api {  // bitset_t was once internal, but made public in the API
 #endif
 
 extern inline void bitset_print(const bitset_t *b);

src/bitset.c

@@ -17,10 +17,9 @@
 #pragma GCC diagnostic ignored "-Wmaybe-uninitialized"
 #endif
 #ifdef __cplusplus
-using namespace ::roaring::internal;
 extern "C" {
 namespace roaring {
-namespace api {
+namespace internal {
 #endif
 
 #if CROARING_IS_X64
@@ -1143,7 +1142,7 @@ void bitset_flip_list(uint64_t *words, const uint16_t *list, uint64_t length) {
 #ifdef __cplusplus
 }
 }
-}  // extern "C" { namespace roaring { namespace api {
+}  // extern "C" { namespace roaring { namespace internal {
 #endif
 #if defined(__GNUC__) && !defined(__clang__)
 #pragma GCC diagnostic pop

src/bitset_util.c

@@ -12,6 +12,7 @@
 
 #ifdef __cplusplus  // stronger type checking errors if C built in C++ mode
 using namespace roaring::internal;
+using namespace roaring::misc;
 #endif
 
 #include "test.h"

tests/add_offset.c

@@ -7,6 +7,11 @@
 
 #include "test.h"
 
+#ifdef __cplusplus  // stronger type checking errors if C built in C++ mode
+using namespace roaring::api;
+using namespace roaring::misc;
+#endif
+
 bool roaring_iterator_sumall(uint32_t value, void *param) {
     *(uint32_t *)param += value;
     return true;  // iterate till the end
@@ -162,4 +167,4 @@ int main() {
     roaring_bitmap_free(r3);
     printf("Success.\n");
     return EXIT_SUCCESS;
-}
+}

tests/c_example1.c

@@ -6,6 +6,10 @@
 
 #include "test.h"
 
+#ifdef __cplusplus  // stronger type checking errors if C built in C++ mode
+using namespace roaring::api;
+#endif
+
 int compute_cardinality(bitset_t *b) {
     size_t k = 0;
     for (size_t i = 0; bitset_next_set_bit(b, &i); i++) {

tests/cbitset_unit.c

@@ -17,6 +17,7 @@
 
 #ifdef __cplusplus  // stronger type checking errors if C built in C++ mode
 using namespace roaring::internal;
+using namespace roaring::misc;
 #endif
 
 #include "test.h"

tests/container_comparison_unit.c

@@ -4,6 +4,7 @@
 #include "roaring/roaring64map.hh"
 
 using namespace roaring;
+
 int main() {
     Roaring r1;
     for (uint32_t i = 100; i < 1000; i++) {