From e4508e87ec9f67c150b557fb20ea832a660dba24 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sun, 9 Sep 2018 15:53:07 -0700 Subject: Another attempt to fix gcc/clang builds --- Common/interface/RefCountedObjectImpl.h | 6 +++--- Common/interface/STDAllocator.h | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'Common/interface') 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 = ""; - static constexpr char* m_dvpFileName = ""; - static constexpr Int32 m_dvpLineNumber = -1; + static constexpr const char* m_dvpDescription = ""; + static constexpr const char* m_dvpFileName = ""; + 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 = ""; - static constexpr char* m_dvpFileName = ""; - static constexpr Int32 m_dvpLineNumber = -1; + static constexpr const char* m_dvpDescription = ""; + static constexpr const char* m_dvpFileName = ""; + static constexpr Int32 m_dvpLineNumber = -1; #endif return reinterpret_cast( m_Allocator.Allocate(count * sizeof(T), m_dvpDescription, m_dvpFileName, m_dvpLineNumber ) ); } -- cgit v1.2.3