AuroraMiddleware/flac
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

more acceptable hack to the workaround of nested classes not being able to see protected members in the parent with some compilers

Browse Source
This commit is contained in:
Josh Coalson 2004-07-30 00:02:33 +00:00
parent bd1e5ffd1f
commit 73e51b822a
4 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
include/FLAC++/decoder.h
View File

@ -142,8 +142,8 @@ namespace FLAC {
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::FLAC__StreamDecoder *decoder_; ::FLAC__StreamDecoder *decoder_;
private: private:
@ -237,8 +237,8 @@ namespace FLAC {
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::FLAC__SeekableStreamDecoder *decoder_; ::FLAC__SeekableStreamDecoder *decoder_;
private: private:
@ -330,8 +330,8 @@ namespace FLAC {
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::FLAC__FileDecoder *decoder_; ::FLAC__FileDecoder *decoder_;
private: private:

12
include/FLAC++/encoder.h
View File

@ -160,8 +160,8 @@ namespace FLAC {
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::FLAC__StreamEncoder *encoder_; ::FLAC__StreamEncoder *encoder_;
private: private:
@ -260,8 +260,8 @@ namespace FLAC {
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0; virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::FLAC__SeekableStreamEncoder *encoder_; ::FLAC__SeekableStreamEncoder *encoder_;
private: private:
@ -361,8 +361,8 @@ namespace FLAC {
virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate); virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::FLAC__FileEncoder *encoder_; ::FLAC__FileEncoder *encoder_;
private: private:

12
include/OggFLAC++/decoder.h
View File

@ -145,8 +145,8 @@ namespace OggFLAC {
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::OggFLAC__StreamDecoder *decoder_; ::OggFLAC__StreamDecoder *decoder_;
private: private:
@ -241,8 +241,8 @@ namespace OggFLAC {
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::OggFLAC__SeekableStreamDecoder *decoder_; ::OggFLAC__SeekableStreamDecoder *decoder_;
private: private:
@ -335,8 +335,8 @@ namespace OggFLAC {
virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::OggFLAC__FileDecoder *decoder_; ::OggFLAC__FileDecoder *decoder_;
private: private:

12
include/OggFLAC++/encoder.h
View File

@ -163,8 +163,8 @@ namespace OggFLAC {
virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::OggFLAC__StreamEncoder *encoder_; ::OggFLAC__StreamEncoder *encoder_;
private: private:
@ -264,8 +264,8 @@ namespace OggFLAC {
virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0; virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::OggFLAC__SeekableStreamEncoder *encoder_; ::OggFLAC__SeekableStreamEncoder *encoder_;
private: private:
@ -366,8 +366,8 @@ namespace OggFLAC {
virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate); virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
#if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) #if (defined _MSC_VER) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96)))
//@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring()
public: friend State;
#endif #endif
::OggFLAC__FileEncoder *encoder_; ::OggFLAC__FileEncoder *encoder_;
private: private: