Skip to content

Commit 34bd2cd

Browse files
authored
Merge pull request #166 from mataron/master
no RTTI & fix compile err when !USE_PLACES_FEATURE
2 parents 7c4dd62 + 2909b35 commit 34bd2cd

1 file changed

Lines changed: 7 additions & 1 deletion

File tree

ImGuiFileDialog.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1711,7 +1711,11 @@ bool IGFD::FileInfos::FinalizeFileTypeParsing(const size_t& vMaxDotToExtract) {
17111711

17121712
IGFD::FileManager::FileManager() {
17131713
fsRoot = IGFD::Utils::GetPathSeparator();
1714-
m_FileSystemName = typeid(FILE_SYSTEM_OVERRIDE).name();
1714+
#define STR(x) #x
1715+
#define STR_AFTER_EXPAND(x) STR(x)
1716+
m_FileSystemName = STR_AFTER_EXPAND(FILE_SYSTEM_OVERRIDE);
1717+
#undef STR_AFTER_EXPAND
1718+
#undef STR
17151719
// std::make_unique is not available un cpp11
17161720
m_FileSystemPtr = std::unique_ptr<FILE_SYSTEM_OVERRIDE>(new FILE_SYSTEM_OVERRIDE());
17171721
// m_FileSystemPtr = std::make_unique<FILE_SYSTEM_OVERRIDE>();
@@ -3590,7 +3594,9 @@ void IGFD::KeyExplorerFeature::SetFlashingAttenuationInSeconds(float vAttenValue
35903594
#pragma region FileDialog
35913595

35923596
IGFD::FileDialog::FileDialog() : PlacesFeature(), KeyExplorerFeature(), ThumbnailFeature() {
3597+
#ifdef USE_PLACES_FEATURE
35933598
m_InitPlaces(m_FileDialogInternal);
3599+
#endif
35943600
}
35953601
IGFD::FileDialog::~FileDialog() = default;
35963602

0 commit comments

Comments
 (0)