Take out C++11-ish feature

This commit is contained in:
twinaphex 2016-08-14 14:21:22 +02:00
parent fcd4c4a8fd
commit d6d74044e1
6 changed files with 5 additions and 7 deletions

View File

@ -67,7 +67,6 @@ ifeq ($(CACHE_CD), 1)
FLAGS += -D__LIBRETRO_CACHE_CD__
endif
ifeq ($(NEED_CD), 1)
ifneq ($(HAVE_GRIFFIN),1)
SOURCES_CXX += $(CDROM_DIR)/CDAccess.cpp \
$(CDROM_DIR)/CDAccess_Image.cpp \
@ -83,7 +82,6 @@ SOURCES_CXX += $(CDROM_DIR)/CDAccess.cpp \
$(CDROM_DIR)/edc_crc32.cpp
endif
FLAGS += -DNEED_CD
endif
ifeq ($(NEED_TREMOR), 1)
SOURCES_C += $(wildcard $(MEDNAFEN_DIR)/tremor/*.c)

View File

@ -18,7 +18,7 @@ class CDAccess
// or if the read can't be done in a thread-safe re-entrant manner.
//
// Writes 96 bytes into pwbuf, and returns 'true' otherwise.
virtual bool Fast_Read_Raw_PW_TSRE(uint8_t* pwbuf, int32_t lba) const noexcept = 0;
virtual bool Fast_Read_Raw_PW_TSRE(uint8_t* pwbuf, int32_t lba) = 0;
virtual void Read_TOC(TOC *toc) = 0;

View File

@ -420,7 +420,7 @@ void CDAccess_CCD::Read_Raw_Sector(uint8_t *buf, int32_t lba)
subpw_interleave(&sub_data[lba * 96], buf + 2352);
}
bool CDAccess_CCD::Fast_Read_Raw_PW_TSRE(uint8_t* pwbuf, int32_t lba) const noexcept
bool CDAccess_CCD::Fast_Read_Raw_PW_TSRE(uint8_t* pwbuf, int32_t lba)
{
if(lba < 0)
{

View File

@ -33,7 +33,7 @@ class CDAccess_CCD : public CDAccess
virtual void Read_Raw_Sector(uint8 *buf, int32 lba);
virtual bool Fast_Read_Raw_PW_TSRE(uint8* pwbuf, int32 lba) const noexcept;
virtual bool Fast_Read_Raw_PW_TSRE(uint8* pwbuf, int32 lba);
virtual void Read_TOC(TOC *toc);

View File

@ -1181,7 +1181,7 @@ void CDAccess_Image::Read_Raw_Sector(uint8_t *buf, int32_t lba)
} // end if audible part of audio track read.
}
bool CDAccess_Image::Fast_Read_Raw_PW_TSRE(uint8_t* pwbuf, int32_t lba) const noexcept
bool CDAccess_Image::Fast_Read_Raw_PW_TSRE(uint8_t* pwbuf, int32_t lba)
{
int32_t track;

View File

@ -44,7 +44,7 @@ class CDAccess_Image : public CDAccess
virtual void Read_Raw_Sector(uint8_t *buf, int32_t lba);
virtual bool Fast_Read_Raw_PW_TSRE(uint8_t* pwbuf, int32_t lba) const noexcept;
virtual bool Fast_Read_Raw_PW_TSRE(uint8_t* pwbuf, int32_t lba);
virtual void Read_TOC(TOC *toc);