0bcd89471c
Replace <iostream.h> and <fstream.h> with their c++ counterparts. Addition of <string.h> was originally under a DragonFly macro, but this was removed when it was shown NetBSD 5.99 needed it too. Allow package to build on all x86_64 architectures.
48 lines
1.1 KiB
Text
48 lines
1.1 KiB
Text
$NetBSD: patch-ar,v 1.2 2011/11/23 08:32:10 marino Exp $
|
|
|
|
--- SpiralSound/Sample.h.orig 2002-06-02 10:28:26.000000000 +0000
|
|
+++ SpiralSound/Sample.h
|
|
@@ -22,6 +22,7 @@
|
|
#include <assert.h>
|
|
#include <limits.h>
|
|
#include <iostream>
|
|
+#include <string.h>
|
|
#include "SpiralInfo.h"
|
|
|
|
//#define DEBUG
|
|
@@ -66,7 +67,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);
|
|
@@ -75,7 +76,7 @@ public:
|
|
}
|
|
|
|
// Linear interpolated
|
|
- inline float Sample::operator[](float i) const
|
|
+ inline float operator[](float i) const
|
|
{
|
|
int ii=(int)i;
|
|
|
|
@@ -89,7 +90,7 @@ public:
|
|
}
|
|
|
|
|
|
- inline void Sample::Set(int i, float v)
|
|
+ inline void Set(int i, float v)
|
|
{
|
|
m_IsEmpty=false;
|
|
#ifdef DEBUG
|
|
@@ -98,7 +99,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());
|