Rebase fixes

Author: rroelke

tiledb/oxidize/cxx-interface/cc/array_schema.h

@@ -27,11 +27,8 @@ void set_tile_extent(Dimension& dimension, rust::Slice<const uint8_t> domain);
 
 }  // namespace dimension
 
-}  // namespace tiledb::oxidize::sm
-
-namespace sm::enumeration {
+namespace enumeration {
 using ConstEnumeration = const tiledb::sm::Enumeration;
 }
 
-}  // namespace tiledb::oxidize
-                               
+}  // namespace tiledb::oxidize::sm

tiledb/sm/query/query_condition.cc

@@ -3055,4 +3055,3 @@ template Status QueryCondition::apply_sparse<uint8_t>(
 template Status QueryCondition::apply_sparse<uint64_t>(
     const QueryCondition::Params&, const ResultTile&, std::span<uint64_t>);
 }  // namespace tiledb::sm
-