diff options
| author | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-12-10 06:12:08 +1100 |
|---|---|---|
| committer | Erik de Castro Lopo <erikd@mega-nerd.com> | 2015-12-10 06:12:19 +1100 |
| commit | a51b27c0edf639e1a06903c60d079b23e9e143e3 (patch) | |
| tree | bf3b4568e778595099920554e43702ae53d1ac70 /include | |
| parent | eb2af522a1effab7b9bc667d7b82a2c1d652e383 (diff) | |
| download | flac-a51b27c0edf639e1a06903c60d079b23e9e143e3.tar.gz | |
Remove (defined _MSC_VER) from cpp workaround
Patch-from: lvqcl <lvqcl.mail@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/FLAC++/decoder.h | 4 | ||||
| -rw-r--r-- | include/FLAC++/encoder.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/FLAC++/decoder.h b/include/FLAC++/decoder.h index 77951e74..f5414139 100644 --- a/include/FLAC++/decoder.h +++ b/include/FLAC++/decoder.h @@ -181,8 +181,8 @@ namespace FLAC { /// see FLAC__StreamDecoderErrorCallback virtual void error_callback(::FLAC__StreamDecoderErrorStatus status) = 0; -#if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) - // lame hack: some MSVC/GCC versions can't see a protected decoder_ from nested State::resolved_as_cstring() +#if (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) + // lame hack: some compilers can't see a protected decoder_ from nested State::resolved_as_cstring() friend State; #endif ::FLAC__StreamDecoder *decoder_; diff --git a/include/FLAC++/encoder.h b/include/FLAC++/encoder.h index 6134e6fd..04914095 100644 --- a/include/FLAC++/encoder.h +++ b/include/FLAC++/encoder.h @@ -193,8 +193,8 @@ namespace FLAC { /// See FLAC__StreamEncoderMetadataCallback virtual void metadata_callback(const ::FLAC__StreamMetadata *metadata); -#if (defined _MSC_VER) || (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) - // lame hack: some MSVC/GCC versions can't see a protected encoder_ from nested State::resolved_as_cstring() +#if (defined __BORLANDC__) || (defined __GNUG__ && (__GNUG__ < 2 || (__GNUG__ == 2 && __GNUC_MINOR__ < 96))) || (defined __SUNPRO_CC) + // lame hack: some compilers can't see a protected encoder_ from nested State::resolved_as_cstring() friend State; #endif ::FLAC__StreamEncoder *encoder_; |