class Aldo < Formula desc "Morse code learning tool released under GPL" homepage "http://www.nongnu.org/aldo/" url "http://download.savannah.nongnu.org/releases/aldo/aldo-0.7.7.tar.bz2" sha256 "f1b8849d09267fff3c1f5122097d90fec261291f51b1e075f37fad8f1b7d9f92" bottle do cellar :any sha256 "dbe8d5416db24547081eb1428342d6bcf213f186daa6b1bdeff88fc59e44c54a" => :el_capitan sha256 "6d76ffaca85b04c3c24005b34d88f19b949b856db2007bc0e35d0fb241142734" => :yosemite sha256 "103b5ae277885d3f2fb8b33fe71eb667b73c1d12614c95a1c184d454f7cf66bb" => :mavericks end depends_on "libao" # Reported upstream: # https://savannah.nongnu.org/bugs/index.php?42127 patch :DATA def install system "./configure", "--disable-dependency-tracking", "--prefix=#{prefix}" system "make", "install" end end __END__ diff --git a/src/menu.cc b/src/menu.cc index 483b826..092d604 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -112,20 +112,17 @@ void Menu::add_item(id_type id, std::string c, Function2 f) void Menu::add_item_at(unsigned int pos, id_type id, std::string c, Function1 f) { - IT it(&m_its[pos]); - m_its.insert(it, Item(id,c,f) ); + m_its.insert(m_its.begin()+pos, Item(id,c,f) ); } void Menu::add_item_at(unsigned int pos, id_type id, std::string c, Function2 f) { - IT it(&m_its[pos]); - m_its.insert(it, Item(id,c,f) ); + m_its.insert(m_its.begin()+pos, Item(id,c,f) ); } void Menu::delete_item_at(unsigned int pos) { - IT it(&m_its[pos]); - m_its.erase(it); + m_its.erase(m_its.begin()+pos); }