[patch] mscore-0.0.6-cppfix.patch

mscore-0.0.6-cppfix.patch (text/plain), 1.63 KB, created by Stian Skjelstad on 2007-04-22 17:02:06 UTC

diff -ur mscore-0.0.6/src/ipmap.h mscore-0.0.6-cppfix/src/ipmap.h
--- mscore-0.0.6/src/ipmap.h	2002-11-21 13:50:49.000000000 +0100
+++ mscore-0.0.6-cppfix/src/ipmap.h	2007-04-22 18:58:18.000000000 +0200
@@ -74,7 +74,6 @@
 
       ipmap() : vmap() {}
 
-      void push_back(T v)             { vmap::push_back((void*)v); }
       iterator begin()                { return vmap::begin(); }
       iterator end()                  { return vmap::end(); }
       const_iterator begin() const    { return vmap::begin(); }
@@ -83,8 +82,6 @@
       reverse_iterator rend()         { return vmap::rend(); }
       const_reverse_iterator rbegin() const { return vmap::rbegin(); }
       const_reverse_iterator rend() const   { return vmap::rend(); }
-      T& back() const                 { return (T&)(vmap::back()); }
-      T& front() const                { return (T&)(vmap::front()); }
       iterator upper_bound(int i)     { return vmap::upper_bound(i); }
       const_iterator upper_bound(int i) const { return vmap::upper_bound(i); }
       };
diff -ur mscore-0.0.6/src/scanvas.h mscore-0.0.6-cppfix/src/scanvas.h
--- mscore-0.0.6/src/scanvas.h	2003-02-04 13:14:48.000000000 +0100
+++ mscore-0.0.6-cppfix/src/scanvas.h	2007-04-22 18:53:35.000000000 +0200
@@ -152,7 +152,7 @@
 
       iPage searchPage(const fPos& pos);
       Element* searchElement(const fPos& pos, Measure*&, Segment*&, int& staff);
-      PElement* ScoreCanvas::searchNote(int tick, int staffIdx) const;
+      PElement* searchNote(int tick, int staffIdx) const;
       bool searchSegment(const fPos& fpos, Measure*&, Segment*&, int& staff);
 
       void changeRest(Rest* rest, int tick, int len);