--- mixkit/src/MxDynBlock.h.orig

+++ mixkit/src/MxDynBlock.h

@@ -35,13 +35,13 @@

     void room_for(int len)

     {

-	if( length()<len ) resize(len);

+	if( length()<len ) this->resize(len);

 	fill = len;

     }

     T& add()

     {

-	if( length()==total_space() )  resize(total_space() * 2);

+	if( length()==total_space() )  this->resize(total_space() * 2);

 	fill++;

 	return last();

     }

@@ -62,8 +62,8 @@

     //

     int size() const { return length(); }

-    typename MxBlock<T>::iterator end()       { return begin()+size(); }

-    typename MxBlock<T>::const_iterator end() const { return begin()+size(); }

+    typename MxBlock<T>::iterator end()       { return this->begin()+size(); }

+    typename MxBlock<T>::const_iterator end() const { return this->begin()+size(); }

     void push_back(const T& t) { add(t); }

 };

--- mixkit/src/MxStack.h.orig

+++ mixkit/src/MxStack.h

@@ -26,14 +26,14 @@

     MxStack(const T& val, unsigned int n) : MxDynBlock<T>(n)

 	{ push(val); }

-    T&       top()       { return last(); }

-    const T& top() const { return last(); }

+    T&       top()       { return this->last(); }

+    const T& top() const { return this->last(); }

-    bool is_empty() { return length()==0; }

+    bool is_empty() { return this->length()==0; }

-    T& pop() { return drop(); }

+    T& pop() { return this->drop(); }

-    void push(const T& val) { add(val); }

+    void push(const T& val) { this->add(val); }

     //

     // NOTE: In this code, it is *crucial* that we do the add() and

     //       assignment in separate steps.  The obvious alternative

@@ -41,7 +41,7 @@

     //       broken!  The top() will grab a pointer into the block,

     //       but the add() may reallocate the block before doing the

     //       assignment.  Thus, the pointer will become invalid.

-    void push() { add(); top() = (*this)[length()-2]; }

+    void push() { this->add(); top() = (*this)[this->length()-2]; }

 };

 // MXSTACK_INCLUDED

@@ -228,7 +228,7 @@

 // Main application routine

 //

-main(int argc, char **argv)

+int main(int argc, char **argv)

 {

     // Change default values for application variables in GUI version

     will_record_history = true;

--- tools/qslim/qslim.cxx.orig

+++ tools/qslim/qslim.cxx

@@ -32,7 +32,7 @@

     output_preamble();

 }

-main(int argc, char **argv)

+int main(int argc, char **argv)

 {

     double input_time, init_time, slim_time, output_time;