From: <sv...@op...> - 2024-03-15 07:50:27
|
Author: manx Date: Fri Mar 15 08:50:11 2024 New Revision: 20329 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=20329 Log: Merged revision(s) 20328 from trunk/OpenMPT: [Fix] Compile fix. ........ Modified: branches/OpenMPT-1.31/ (props changed) branches/OpenMPT-1.31/src/mpt/io_read/filereader.hpp Modified: branches/OpenMPT-1.31/src/mpt/io_read/filereader.hpp ============================================================================== --- branches/OpenMPT-1.31/src/mpt/io_read/filereader.hpp Fri Mar 15 08:49:40 2024 (r20328) +++ branches/OpenMPT-1.31/src/mpt/io_read/filereader.hpp Fri Mar 15 08:50:11 2024 (r20329) @@ -44,6 +44,12 @@ +// change to show warnings for functions which trigger pre-caching the whole file for unseekable streams +//#define MPT_FILEREADER_DEPRECATED [[deprecated]] +#define MPT_FILEREADER_DEPRECATED + + + // TFileCursor members begin template <typename TFileCursor> @@ -100,13 +106,13 @@ // Returns size of the mapped file in bytes. template <typename TFileCursor> -MPT_FILECURSOR_DEPRECATED typename TFileCursor::pos_type GetLength(const TFileCursor & f) { +MPT_FILEREADER_DEPRECATED typename TFileCursor::pos_type GetLength(const TFileCursor & f) { return f.GetLength(); } // Return byte count between cursor position and end of file, i.e. how many bytes can still be read. template <typename TFileCursor> -MPT_FILECURSOR_DEPRECATED typename TFileCursor::pos_type BytesLeft(const TFileCursor & f) { +MPT_FILEREADER_DEPRECATED typename TFileCursor::pos_type BytesLeft(const TFileCursor & f) { return f.BytesLeft(); } |