Prefix math functions with std::

Author: pschatzmann

projects/demo/demo.cpp

@@ -104,7 +104,7 @@ void processMessage( TickData* data )
     else if (value1 == 52.0) {
       data->frequency += ( data->message.intValues[1] << 7 );
       // Convert to a fractional MIDI note value
-      StkFloat note = 12.0 * log( data->frequency / 220.0 ) / log( 2.0 ) + 57.0;
+      StkFloat note = 12.0 * std::log( data->frequency / 220.0 ) / std::log( 2.0 ) + 57.0;
       data->voicer->setFrequency( note );
     }
     else

projects/examples/controlbee.cpp

@@ -53,7 +53,7 @@ void processMessage( TickData* data )
     if ( value2 == 0.0 ) // velocity is zero ... really a NoteOff
       data->instrument->noteOff( 0.5 );
     else { // a NoteOn
-      StkFloat frequency = 220.0 * pow( 2.0, (value1 - 57.0) / 12.0 ); 
+      StkFloat frequency = 220.0 * std::pow( 2.0, (value1 - 57.0) / 12.0 ); 
       data->instrument->noteOn( frequency, value2 * ONE_OVER_128 );
     }
     break;

src/BandedWG.cpp

@@ -82,7 +82,7 @@ void BandedWG :: setPreset( int preset )
     modes_[3] = (StkFloat) 18.0697050938;
 
     for (i=0; i<presetModes_; i++) {
-      basegains_[i] = (StkFloat) pow(0.999,(float) i+1);
+      basegains_[i] = (StkFloat) std::pow(0.999,(float) i+1);
       excitation_[i] = 1.0;
     }
 
@@ -98,13 +98,13 @@ void BandedWG :: setPreset( int preset )
     // modes_[5] = (StkFloat) 12.22;
 
     for (i=0; i<presetModes_; i++) {
-      basegains_[i] = (StkFloat) pow(0.999,(float) i+1);
+      basegains_[i] = (StkFloat) std::pow(0.999,(float) i+1);
       excitation_[i] = 1.0;
     }
     /*
       baseGain_ = (StkFloat) 0.99999;
       for (i=0; i<presetModes_; i++) 
-      gains_[i]= (StkFloat) pow(baseGain_, delay_[i].getDelay()+i);
+      gains_[i]= (StkFloat) std::pow(baseGain_, delay_[i].getDelay()+i);
     */
 
     break;
@@ -158,7 +158,7 @@ void BandedWG :: setPreset( int preset )
     modes_[3] = (StkFloat) 8.933;
 
     for (i=0; i<presetModes_; i++) {
-      basegains_[i] = (StkFloat) pow(0.9,(float) i+1);
+      basegains_[i] = (StkFloat) std::pow(0.9,(float) i+1);
       excitation_[i] = 1.0;
     }
 
@@ -189,7 +189,7 @@ void BandedWG :: setFrequency( StkFloat frequency )
     if ( length > 2.0f) {
       delay_[i].setDelay( length );
       gains_[i]=basegains_[i];
-      //	  gains_[i]=(StkFloat) pow(basegains_[i], 1/((StkFloat)delay_[i].getDelay()));
+      //	  gains_[i]=(StkFloat) std::pow(basegains_[i], 1/((StkFloat)delay_[i].getDelay()));
       //	  std::cerr << gains_[i];
     }
     else	{
@@ -339,7 +339,7 @@ void BandedWG :: controlChange( int number, StkFloat value )
     //	std::cerr << "Yuck!" << std::endl;
     for (int i=0; i<nModes_; i++)
       gains_[i]=(StkFloat) basegains_[i]*baseGain_;
-    //      gains_[i]=(StkFloat) pow(baseGain_, (int)((StkFloat)delay_[i].getDelay()+i));
+    //      gains_[i]=(StkFloat) std::pow(baseGain_, (int)((StkFloat)delay_[i].getDelay()+i));
   }
   else if (number == __SK_ModFrequency_) // 11
     integrationConstant_ = normalizedValue;

src/BiQuad.cpp

@@ -65,7 +65,7 @@ void BiQuad :: setResonance( StkFloat frequency, StkFloat radius, bool normalize
 #endif
 
   a_[2] = radius * radius;
-  a_[1] = -2.0f   * radius * cos( STK_TWO_PI * frequency / Stk::sampleRate() );
+  a_[1] = -2.0f   * radius * std::cos( STK_TWO_PI * frequency / Stk::sampleRate() );
 
   if ( normalize ) {
     // Use zeros at +- 1 and normalize the filter peak gain.
@@ -90,7 +90,7 @@ void BiQuad :: setNotch( StkFloat frequency, StkFloat radius )
 
   // This method does not attempt to normalize the filter gain.
   b_[2] = radius * radius;
-  b_[1] = (StkFloat) -2.0 * radius * cos( STK_TWO_PI * (float) frequency / Stk::sampleRate() );
+  b_[1] = (StkFloat) -2.0 * radius * std::cos( STK_TWO_PI * (float) frequency / Stk::sampleRate() );
 }
 
 void BiQuad :: setEqualGainZeroes( void )

src/Blit.cpp

@@ -68,7 +68,7 @@ void Blit :: setHarmonics( unsigned int nHarmonics )
 void Blit :: updateHarmonics( void )
 {
   if ( nHarmonics_ <= 0 ) {
-    unsigned int maxHarmonics = (unsigned int) floor( 0.5f * p_ );
+    unsigned int maxHarmonics = (unsigned int) std::floor( 0.5f * p_ );
     m_ = 2 * maxHarmonics + 1;
   }
   else

src/Blit.h

@@ -118,7 +118,7 @@ inline StkFloat Blit :: tick( void )
   if ( denominator <= std::numeric_limits<StkFloat>::epsilon() )
     tmp = 1.0;
   else {
-    tmp =  sin( m_ * phase_ );
+    tmp =  std::sin( m_ * phase_ );
     tmp /= m_ * denominator;
   }
 

src/BlitSaw.cpp

@@ -79,7 +79,7 @@ void BlitSaw :: setHarmonics( unsigned int nHarmonics )
 void BlitSaw :: updateHarmonics( void )
 {
   if ( nHarmonics_ <= 0 ) {
-    unsigned int maxHarmonics = (unsigned int) floor( 0.5f * p_ );
+    unsigned int maxHarmonics = (unsigned int) std::floor( 0.5f * p_ );
     m_ = 2 * maxHarmonics + 1;
   }
   else

src/BlitSaw.h

@@ -108,10 +108,10 @@ inline StkFloat BlitSaw :: tick( void )
   // Avoid a divide by zero, or use of a denormalized divisor 
   // at the sinc peak, which has a limiting value of m_ / p_.
   StkFloat tmp, denominator = sin( phase_ );
-  if ( fabs(denominator) <= std::numeric_limits<StkFloat>::epsilon() )
+  if ( std::fabs(denominator) <= std::numeric_limits<StkFloat>::epsilon() )
     tmp = a_;
   else {
-    tmp =  sin( m_ * phase_ );
+    tmp =  std::sin( m_ * phase_ );
     tmp /= p_ * denominator;
   }
 

src/BlitSquare.cpp

@@ -83,7 +83,7 @@ void BlitSquare :: updateHarmonics( void )
 {
   // Make sure we end up with an even value of the parameter M here.
   if ( nHarmonics_ <= 0 ) {
-    unsigned int maxHarmonics = (unsigned int) floor( 0.5f * p_ );
+    unsigned int maxHarmonics = (unsigned int) std::floor( 0.5f * p_ );
     m_ = 2 * (maxHarmonics + 1);
   }
   else

src/BlitSquare.h

@@ -123,16 +123,16 @@ inline StkFloat BlitSquare :: tick( void )
 
   // Avoid a divide by zero, or use of a denomralized divisor
   // at the sinc peak, which has a limiting value of 1.0.
-  StkFloat denominator = sin( phase_ );
-  if ( fabs( denominator )  < std::numeric_limits<StkFloat>::epsilon() ) {
+  StkFloat denominator = std::sin( phase_ );
+  if ( std::fabs( denominator )  < std::numeric_limits<StkFloat>::epsilon() ) {
     // Inexact comparison safely distinguishes betwen *close to zero*, and *close to PI*.
     if ( phase_ < 0.1f || phase_ > STK_TWO_PI - 0.1f )
       lastBlitOutput_ = a_;
     else
       lastBlitOutput_ = -a_;
   }
   else {
-    lastBlitOutput_ =  sin( m_ * phase_ );
+    lastBlitOutput_ =  std::sin( m_ * phase_ );
     lastBlitOutput_ /= p_ * denominator;
   }