Skip to content

Commit

Permalink
fix warnings, fix incorrect static_assert() in AnariAny::getObject()
Browse files Browse the repository at this point in the history
  • Loading branch information
jeffamstutz committed Feb 6, 2023
1 parent c73b2ec commit 5509fab
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion libs/helide/array/Array.h
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ struct Array : public helium::BaseArray
void commit() override;
void *map() override;
virtual void unmap() override;
virtual void privatize() = 0;
virtual void privatize() override = 0;

bool wasPrivatized() const;

Expand Down
2 changes: 1 addition & 1 deletion libs/helide/frame/Frame.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct Frame : public helium::BaseFrame
void *ptr,
uint32_t flags) override;

void commit();
void commit() override;

void renderFrame() override;

Expand Down
4 changes: 2 additions & 2 deletions libs/helium/utility/AnariAny.h
Original file line number Diff line number Diff line change
Expand Up @@ -211,9 +211,9 @@ inline void *AnariAny::data()
template <typename T>
inline T *AnariAny::getObject() const
{
constexpr ANARIDataType type = anari::ANARITypeFor<T>::value;
constexpr ANARIDataType type = anari::ANARITypeFor<T *>::value;
static_assert(
!anari::isObject(type), "use AnariAny::get() for getting non-objects");
anari::isObject(type), "use AnariAny::get() for getting non-objects");
return anari::isObject(this->type()) ? storageAs<T *>() : nullptr;
}

Expand Down

0 comments on commit 5509fab

Please sign in to comment.