diff options
| author | Egor Yusov <egor.yusov@gmail.com> | 2018-09-09 22:53:07 +0000 |
|---|---|---|
| committer | Egor Yusov <egor.yusov@gmail.com> | 2018-09-09 22:53:07 +0000 |
| commit | e4508e87ec9f67c150b557fb20ea832a660dba24 (patch) | |
| tree | 1761def0a11a235a55f8390a42898f582e8b120d /Common/interface | |
| parent | Attempting to fix build error on gcc (diff) | |
| download | DiligentCore-e4508e87ec9f67c150b557fb20ea832a660dba24.tar.gz DiligentCore-e4508e87ec9f67c150b557fb20ea832a660dba24.zip | |
Another attempt to fix gcc/clang builds
Diffstat (limited to 'Common/interface')
| -rw-r--r-- | Common/interface/RefCountedObjectImpl.h | 6 | ||||
| -rw-r--r-- | Common/interface/STDAllocator.h | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/Common/interface/RefCountedObjectImpl.h b/Common/interface/RefCountedObjectImpl.h index edabc22e..0a269a0f 100644 --- a/Common/interface/RefCountedObjectImpl.h +++ b/Common/interface/RefCountedObjectImpl.h @@ -637,9 +637,9 @@ public: try { #ifndef DEVELOPMENT - static constexpr char* m_dvpDescription = "<Unavailable in release build>"; - static constexpr char* m_dvpFileName = "<Unavailable in release build>"; - static constexpr Int32 m_dvpLineNumber = -1; + static constexpr const char* m_dvpDescription = "<Unavailable in release build>"; + static constexpr const char* m_dvpFileName = "<Unavailable in release build>"; + static constexpr Int32 m_dvpLineNumber = -1; #endif // Operators new and delete of RefCountedObject are private and only accessible // by methods of MakeNewRCObj diff --git a/Common/interface/STDAllocator.h b/Common/interface/STDAllocator.h index a58545eb..6c11fa3d 100644 --- a/Common/interface/STDAllocator.h +++ b/Common/interface/STDAllocator.h @@ -98,9 +98,9 @@ struct STDAllocator T* allocate(std::size_t count) { #ifndef DEVELOPMENT - static constexpr char* m_dvpDescription = "<Unavailable in release build>"; - static constexpr char* m_dvpFileName = "<Unavailable in release build>"; - static constexpr Int32 m_dvpLineNumber = -1; + static constexpr const char* m_dvpDescription = "<Unavailable in release build>"; + static constexpr const char* m_dvpFileName = "<Unavailable in release build>"; + static constexpr Int32 m_dvpLineNumber = -1; #endif return reinterpret_cast<T*>( m_Allocator.Allocate(count * sizeof(T), m_dvpDescription, m_dvpFileName, m_dvpLineNumber ) ); } |