Skip to content

Commit 1249981

Browse files
fix dllexport of vtable issue
1 parent 0404559 commit 1249981

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

include/nbl/asset/IAsset.h

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class IAssetManager;
3939
@see IReferenceCounted
4040
*/
4141

42-
class NBL_API2 IAsset : virtual public core::IReferenceCounted
42+
class IAsset : virtual public core::IReferenceCounted
4343
{
4444
public:
4545
enum E_MUTABILITY : uint32_t
@@ -159,7 +159,7 @@ class NBL_API2 IAsset : virtual public core::IReferenceCounted
159159
}
160160

161161
//!
162-
IAsset() : isDummyObjectForCacheAliasing{false}, m_mutability{EM_MUTABLE} {}
162+
inline IAsset() : isDummyObjectForCacheAliasing{false}, m_mutability{EM_MUTABLE} {}
163163

164164
//! Returns correct size reserved associated with an Asset and its data
165165
/**
@@ -175,7 +175,7 @@ class NBL_API2 IAsset : virtual public core::IReferenceCounted
175175
//! creates a copy of the asset, duplicating dependant resources up to a certain depth (default duplicate everything)
176176
virtual core::smart_refctd_ptr<IAsset> clone(uint32_t _depth = ~0u) const = 0;
177177

178-
bool restoreFromDummy(IAsset* _other, uint32_t _levelsBelow = (~0u))
178+
inline bool restoreFromDummy(IAsset* _other, uint32_t _levelsBelow = (~0u))
179179
{
180180
assert(getAssetType() == _other->getAssetType());
181181

@@ -187,7 +187,7 @@ class NBL_API2 IAsset : virtual public core::IReferenceCounted
187187
return true;
188188
}
189189

190-
bool willBeRestoredFrom(const IAsset* _other) const
190+
inline bool willBeRestoredFrom(const IAsset* _other) const
191191
{
192192
assert(getAssetType() == _other->getAssetType());
193193

@@ -211,7 +211,7 @@ class NBL_API2 IAsset : virtual public core::IReferenceCounted
211211
virtual bool canBeRestoredFrom(const IAsset* _other) const = 0;
212212

213213
// returns if `this` is dummy or any of its dependencies up to `_levelsBelow` levels below
214-
bool isAnyDependencyDummy(uint32_t _levelsBelow = ~0u) const
214+
inline bool isAnyDependencyDummy(uint32_t _levelsBelow = ~0u) const
215215
{
216216
if (isADummyObjectForCache())
217217
return true;
@@ -270,7 +270,7 @@ class NBL_API2 IAsset : virtual public core::IReferenceCounted
270270
*/
271271
virtual void convertToDummyObject(uint32_t referenceLevelsBelowToConvert=0u) = 0;
272272

273-
void convertToDummyObject_common(uint32_t referenceLevelsBelowToConvert)
273+
inline void convertToDummyObject_common(uint32_t referenceLevelsBelowToConvert)
274274
{
275275
if (canBeConvertedToDummy())
276276
isDummyObjectForCacheAliasing = true;
@@ -280,7 +280,7 @@ class NBL_API2 IAsset : virtual public core::IReferenceCounted
280280
inline bool isInValidState() { return !isDummyObjectForCacheAliasing /* || !isCached TODO*/; }
281281

282282
//! Pure virtual destructor to ensure no instantiation
283-
virtual ~IAsset() = 0;
283+
NBL_API2 virtual ~IAsset() = 0;
284284

285285
public:
286286
//! To be implemented by derived classes. Returns a type of an Asset

0 commit comments

Comments
 (0)