Fix for VS2010 which had been throwing out "cannot access protected member declared...

diff --git a/taglib/it/itproperties.h b/taglib/it/itproperties.h
index 79ebc383df9c56e21263e39ce84fabd2b63f6986..b63b0c85b917d82106234bbea2fcf172acdd802d 100644 (file)
--- a/taglib/it/itproperties.h
+++ b/taglib/it/itproperties.h
@@ -72,7 +72,10 @@ namespace TagLib {
       uchar  panningSeparation() const;
       uchar  pitchWheelDepth()   const;
 
+#if !defined(_MSC_VER)
     protected:
+#endif
+
       void setChannels(int channels);
 
       void setLengthInPatterns(ushort lengthInPatterns);

diff --git a/taglib/mod/modproperties.h b/taglib/mod/modproperties.h
index 8bf3ac5ea0ab7cafc96385a0350c1a88c3266d51..bdf1b75201788038be355a8407c0ad8d9799204f 100644 (file)
--- a/taglib/mod/modproperties.h
+++ b/taglib/mod/modproperties.h
@@ -41,7 +41,9 @@ namespace TagLib {
       uint  instrumentCount()  const;
       uchar lengthInPatterns() const;
 
+#if !defined(_MSC_VER)
     protected:
+#endif
       void setChannels(int channels);
 
       void setInstrumentCount(uint sampleCount);

diff --git a/taglib/s3m/s3mproperties.h b/taglib/s3m/s3mproperties.h
index 4be1450835a0376b4721c5da9b1fafbcd884ae1f..820623ab65e4c40a1be4ae70bfabc3b548c11350 100644 (file)
--- a/taglib/s3m/s3mproperties.h
+++ b/taglib/s3m/s3mproperties.h
@@ -61,7 +61,9 @@ namespace TagLib {
       uchar  tempo()             const;
       uchar  bpmSpeed()          const;
 
+#if !defined(_MSC_VER)
     protected:
+#endif
       void setChannels(int channels);
 
       void setLengthInPatterns (ushort lengthInPatterns);

diff --git a/taglib/xm/xmproperties.h b/taglib/xm/xmproperties.h
index 97f93111801ff5c4a7fce92c81604a7a5905cc98..7ba193a2ddea252cd3e5a6e073cfac11510ad2b3 100644 (file)
--- a/taglib/xm/xmproperties.h
+++ b/taglib/xm/xmproperties.h
@@ -54,7 +54,9 @@ namespace TagLib {
       ushort tempo()            const;
       ushort bpmSpeed()         const;
 
+#if !defined(_MSC_VER)
     protected:
+#endif
       void setChannels(int channels);
 
       void setLengthInPatterns(ushort lengthInPatterns);