Skip to content

Commit

Permalink
Set min macos version [skip ci]
Browse files Browse the repository at this point in the history
  • Loading branch information
XanthosXanthopoulos committed Nov 21, 2024
1 parent a0618f1 commit 01d39fc
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
1 change: 1 addition & 0 deletions libtiledbsoma/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ endif()
# Use @rpath on macOS for building shared libraries.
if(APPLE)
set(CMAKE_MACOSX_RPATH ON)
set(CMAKE_OSX_DEPLOYMENT_TARGET 13.3)

# Don't allow macOS .frameworks to be used for dependencies.
set(CMAKE_FIND_FRAMEWORK NEVER)
Expand Down
28 changes: 14 additions & 14 deletions libtiledbsoma/src/soma/soma_attribute.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@ class SOMAAttribute : public virtual SOMAColumn {
, enumeration(enumeration) {
}

virtual inline std::string name() const {
virtual inline std::string name() const override {
return attribute.name();
}

virtual inline bool isIndexColumn() const {
virtual inline bool isIndexColumn() const override {
return false;
}

Expand All @@ -42,28 +42,28 @@ class SOMAAttribute : public virtual SOMAColumn {
query->select_columns(std::vector({attribute.name()}), if_not_empty);
};

inline soma_column_datatype_t type() const {
inline virtual soma_column_datatype_t type() const override {
return soma_column_datatype_t::SOMA_COLUMN_ATTRIBUTE;
}

inline std::optional<tiledb_datatype_t> domain_type() const {
inline virtual std::optional<tiledb_datatype_t> domain_type() const override {
return std::nullopt;
}

inline std::optional<tiledb_datatype_t> data_type() const {
inline virtual std::optional<tiledb_datatype_t> data_type() const override {
return attribute.type();
}

inline std::optional<std::vector<Dimension>> tiledb_dimensions() {
inline virtual std::optional<std::vector<Dimension>> tiledb_dimensions() override {
return std::nullopt;
}

inline std::optional<std::vector<Attribute>> tiledb_attributes() {
inline virtual std::optional<std::vector<Attribute>> tiledb_attributes() override {
return std::vector({attribute});
}

inline virtual std::optional<std::vector<Enumeration>>
tiledb_enumerations() {
tiledb_enumerations() override {
if (!enumeration.has_value()) {
return std::nullopt;
}
Expand All @@ -83,22 +83,22 @@ class SOMAAttribute : public virtual SOMAColumn {
virtual void _set_dim_points(
const std::unique_ptr<ManagedQuery>& query,
const SOMAContext& ctx,
const std::any& points) const;
const std::any& points) const override;

virtual void _set_dim_ranges(
const std::unique_ptr<ManagedQuery>& query,
const SOMAContext& ctx,
const std::any& ranges) const;
const std::any& ranges) const override;

virtual void _set_current_domain_slot(
NDRectangle& rectangle, const std::vector<const void*>& domain) const;
NDRectangle& rectangle, const std::vector<const void*>& domain) const override;

virtual std::any _core_domain_slot() const;
virtual std::any _core_domain_slot() const override;

virtual std::any _non_empty_domain_slot(Array& array) const;
virtual std::any _non_empty_domain_slot(Array& array) const override;

virtual std::any _core_current_domain_slot(
const SOMAContext& ctx, Array& array) const;
const SOMAContext& ctx, Array& array) const override;

Attribute attribute;
std::optional<Enumeration> enumeration;
Expand Down

0 comments on commit 01d39fc

Please sign in to comment.