Merge pull request #4 from radarsat1/master

Fix several potential compilation issues on various platforms, fix ElectricGuitar script, fix version number, add McGill logo.
This commit is contained in:
garyscavone
2014-01-18 12:49:51 -08:00
9 changed files with 31 additions and 6 deletions

View File

@@ -192,7 +192,7 @@ void Stk :: sleep(unsigned long milliseconds)
#endif
}
void Stk :: handleError( StkError::Type type )
void Stk :: handleError( StkError::Type type ) const
{
handleError( oStream_.str(), type );
oStream_.str( std::string() ); // reset the ostringstream buffer