Browse Source

Fix compile with newer gcc's

master
aj_genius 18 years ago
parent
commit
19e7c0405f
2 changed files with 10 additions and 10 deletions
  1. +4
    -4
      SpiralSound/Sample.h
  2. +6
    -6
      SpiralSound/SpiralInfo.h

+ 4
- 4
SpiralSound/Sample.h View File

@@ -68,7 +68,7 @@ public:
void CropTo(int NewLength);
bool IsEmpty() const { return m_IsEmpty; }

inline float &Sample::operator[](int i) const
inline float &operator[](int i) const
{
#ifdef DEBUG
assert(i>=0 && i<m_Length);
@@ -77,7 +77,7 @@ public:
}

// Linear interpolated
inline float Sample::operator[](float i) const
inline float operator[](float i) const
{
int ii=(int)i;

@@ -91,7 +91,7 @@ public:
}


inline void Sample::Set(int i, float v)
inline void Set(int i, float v)
{
m_IsEmpty=false;
#ifdef DEBUG
@@ -100,7 +100,7 @@ public:
m_Data[i]=v;
}

inline Sample &Sample::operator=(const Sample &rhs)
inline Sample &operator=(const Sample &rhs)
{
Allocate(rhs.GetLength());
memcpy(m_Data,rhs.GetBuffer(),GetLengthInBytes());


+ 6
- 6
SpiralSound/SpiralInfo.h View File

@@ -73,14 +73,14 @@ class SpiralInfo {
int m_Version;
static SpiralInfo *m_SpiralInfo;

void SpiralInfo::StreamOutMainColourPrefs (ostream &s);
bool SpiralInfo::StreamInMainColourPrefs (istream &s, string &section, string &ident);
void StreamOutMainColourPrefs (ostream &s);
bool StreamInMainColourPrefs (istream &s, string &section, string &ident);
void SpiralInfo::StreamOutDeviceColourPrefs (ostream &s);
bool SpiralInfo::StreamInDeviceColourPrefs (istream &s, string &section, string &ident);
void StreamOutDeviceColourPrefs (ostream &s);
bool StreamInDeviceColourPrefs (istream &s, string &section, string &ident);
void SpiralInfo::StreamOutAudioSettingsPrefs (ostream &s);
bool SpiralInfo::StreamInAudioSettingsPrefs (istream &s, string &section, string &ident);
void StreamOutAudioSettingsPrefs (ostream &s);
bool StreamInAudioSettingsPrefs (istream &s, string &section, string &ident);

void StreamInPrefs (istream &s);
void StreamOutPrefs (ostream &s);


Loading…
Cancel
Save