workaround MSVC bug re: scoping of nested classes

diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h
index ce112a8..196e9f5 100644 (file)
--- a/include/FLAC++/decoder.h
+++ b/include/FLAC++/decoder.h
@@ -140,6 +140,10 @@ namespace FLAC {
                        virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
                        virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::FLAC__StreamDecoder *decoder_;
                private:
                        static ::FLAC__StreamDecoderReadStatus read_callback_(const ::FLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
@@ -230,6 +234,10 @@ namespace FLAC {
                        virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
                        virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::FLAC__SeekableStreamDecoder *decoder_;
                private:
                        static ::FLAC__SeekableStreamDecoderReadStatus read_callback_(const ::FLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
@@ -318,6 +326,10 @@ namespace FLAC {
                        virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
                        virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::FLAC__FileDecoder *decoder_;
                private:
                        static ::FLAC__StreamDecoderWriteStatus write_callback_(const ::FLAC__FileDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);

diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h
index a1252bd..b00018a 100644 (file)
--- a/include/FLAC++/encoder.h
+++ b/include/FLAC++/encoder.h
@@ -157,6 +157,10 @@ namespace FLAC {
                        virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
                        virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::FLAC__StreamEncoder *encoder_;
                private:
                        static ::FLAC__StreamEncoderWriteStatus write_callback_(const ::FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data);
@@ -252,6 +256,10 @@ namespace FLAC {
                        virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
                        virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::FLAC__SeekableStreamEncoder *encoder_;
                private:
                        static ::FLAC__SeekableStreamEncoderSeekStatus seek_callback_(const FLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data);
@@ -348,6 +356,10 @@ namespace FLAC {
                protected:
                        virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::FLAC__FileEncoder *encoder_;
                private:
                        static void progress_callback_(const ::FLAC__FileEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data);

diff --git a/include/OggFLAC++/decoder.h b/include/OggFLAC++/decoder.h
index 31510ad..8fd0b27 100644 (file)
--- a/include/OggFLAC++/decoder.h
+++ b/include/OggFLAC++/decoder.h
@@ -144,6 +144,10 @@ namespace OggFLAC {
                        virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
                        virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::OggFLAC__StreamDecoder *decoder_;
                private:
                        static ::FLAC__StreamDecoderReadStatus read_callback_(const ::OggFLAC__StreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
@@ -236,6 +240,10 @@ namespace OggFLAC {
                        virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
                        virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::OggFLAC__SeekableStreamDecoder *decoder_;
                private:
                        static ::FLAC__SeekableStreamDecoderReadStatus read_callback_(const ::OggFLAC__SeekableStreamDecoder *decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data);
@@ -326,6 +334,10 @@ namespace OggFLAC {
                        virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
                        virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected decoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::OggFLAC__FileDecoder *decoder_;
                private:
                        static ::FLAC__StreamDecoderWriteStatus write_callback_(const ::OggFLAC__FileDecoder *decoder, const ::FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data);

diff --git a/include/OggFLAC++/encoder.h b/include/OggFLAC++/encoder.h
index f2917c7..5c6b73e 100644 (file)
--- a/include/OggFLAC++/encoder.h
+++ b/include/OggFLAC++/encoder.h
@@ -162,6 +162,10 @@ namespace OggFLAC {
                        virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
                        virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::OggFLAC__StreamEncoder *encoder_;
                private:
                        static ::FLAC__StreamEncoderWriteStatus write_callback_(const ::OggFLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data);
@@ -259,6 +263,10 @@ namespace OggFLAC {
                        virtual ::FLAC__SeekableStreamEncoderTellStatus tell_callback(FLAC__uint64 *absolute_byte_offset) = 0;
                        virtual ::FLAC__StreamEncoderWriteStatus write_callback(const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame) = 0;
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::OggFLAC__SeekableStreamEncoder *encoder_;
                private:
                        static ::FLAC__SeekableStreamEncoderSeekStatus seek_callback_(const OggFLAC__SeekableStreamEncoder *encoder, FLAC__uint64 absolute_byte_offset, void *client_data);
@@ -357,6 +365,10 @@ namespace OggFLAC {
                protected:
                        virtual void progress_callback(FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate);
 
+#ifdef _MSC_VER
+               //@@@@@@ lame hack: some MSVC versions can't see a protected encoder_ from nested State::resolved_as_cstring(); fix properly later
+               public:
+#endif
                        ::OggFLAC__FileEncoder *encoder_;
                private:
                        static void progress_callback_(const ::OggFLAC__FileEncoder *encoder, FLAC__uint64 bytes_written, FLAC__uint64 samples_written, unsigned frames_written, unsigned total_frames_estimate, void *client_data);