|
@@ -80,6 +80,8 @@ class TypedObject;
|
|
|
*/
|
|
*/
|
|
|
class EXPCL_DTOOL TypeHandle FINAL {
|
|
class EXPCL_DTOOL TypeHandle FINAL {
|
|
|
PUBLISHED:
|
|
PUBLISHED:
|
|
|
|
|
+ TypeHandle() NOEXCEPT DEFAULT_CTOR;
|
|
|
|
|
+
|
|
|
enum MemoryClass {
|
|
enum MemoryClass {
|
|
|
MC_singleton,
|
|
MC_singleton,
|
|
|
MC_array,
|
|
MC_array,
|
|
@@ -127,7 +129,7 @@ PUBLISHED:
|
|
|
|
|
|
|
|
INLINE int get_index() const;
|
|
INLINE int get_index() const;
|
|
|
INLINE void output(ostream &out) const;
|
|
INLINE void output(ostream &out) const;
|
|
|
- INLINE static TypeHandle none();
|
|
|
|
|
|
|
+ CONSTEXPR static TypeHandle none();
|
|
|
INLINE operator bool () const;
|
|
INLINE operator bool () const;
|
|
|
|
|
|
|
|
MAKE_PROPERTY(index, get_index);
|
|
MAKE_PROPERTY(index, get_index);
|
|
@@ -140,12 +142,15 @@ public:
|
|
|
void *reallocate_array(void *ptr, size_t size) RETURNS_ALIGNED(MEMORY_HOOK_ALIGNMENT);
|
|
void *reallocate_array(void *ptr, size_t size) RETURNS_ALIGNED(MEMORY_HOOK_ALIGNMENT);
|
|
|
void deallocate_array(void *ptr);
|
|
void deallocate_array(void *ptr);
|
|
|
|
|
|
|
|
- INLINE static TypeHandle from_index(int index);
|
|
|
|
|
|
|
+ CONSTEXPR static TypeHandle from_index(int index);
|
|
|
|
|
|
|
|
private:
|
|
private:
|
|
|
- int _index;
|
|
|
|
|
|
|
+ CONSTEXPR TypeHandle(int index);
|
|
|
|
|
+
|
|
|
|
|
+ // Only kept temporarily for ABI compatibility.
|
|
|
static TypeHandle _none;
|
|
static TypeHandle _none;
|
|
|
|
|
|
|
|
|
|
+ int _index;
|
|
|
friend class TypeRegistry;
|
|
friend class TypeRegistry;
|
|
|
};
|
|
};
|
|
|
|
|
|