diff options
| author | Josh Coalson <jcoalson@users.sourceforce.net> | 2004-07-30 00:02:33 +0000 |
|---|---|---|
| committer | Josh Coalson <jcoalson@users.sourceforce.net> | 2004-07-30 00:02:33 +0000 |
| commit | 73e51b822ae60e2877f53244041edd25a05d233e (patch) | |
| tree | 5433740acd9de6ad14ec42be1e1c5e7f74bbf966 /include/FLAC++/encoder.h | |
| parent | bd1e5ffd1f0b8924e2544a16c0a079cf9820b42c (diff) | |
| download | flac-73e51b822ae60e2877f53244041edd25a05d233e.tar.gz | |
more acceptable hack to the workaround of nested classes not being able to see protected members in the parent with some compilers
Diffstat (limited to 'include/FLAC++/encoder.h')
| -rw-r--r-- | include/FLAC++/encoder.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h index 1bc6411a..5d5bd0ee 100644 --- a/include/FLAC++/encoder.h +++ b/include/FLAC++/encoder.h @@ -160,8 +160,8 @@ namespace FLAC { virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0; #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 - public: + // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring() + friend State; #endif ::FLAC__StreamEncoder *encoder_; private: @@ -260,8 +260,8 @@ namespace FLAC { 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))) - //@@@@@@ lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later - public: + // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring() + friend State; #endif ::FLAC__SeekableStreamEncoder *encoder_; 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); #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 - public: + // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring() + friend State; #endif ::FLAC__FileEncoder *encoder_; private: |