class Aldo < Formula desc "Morse code learning tool released under GPL" homepage "http://www.nongnu.org/aldo/" url "https://savannah.nongnu.org/download/aldo/aldo-0.7.7.tar.bz2" sha256 "f1b8849d09267fff3c1f5122097d90fec261291f51b1e075f37fad8f1b7d9f92" bottle do cellar :any rebuild 1 sha256 "d30e5e60defc2e2d2110cf52a60898d94ae3331a679f1c228e0d598421a594d9" => :high_sierra sha256 "ad5216c04fce4d1f4da63af2fa4d298a3414073db186991ec4389a942799ddd1" => :sierra sha256 "0691c4b9b7ae5b6f104c5b5205f731d4348563b8a9a8c3631395f619ce00aabf" => :el_capitan sha256 "f5d55cefcfc65033f50bf2aedb30298db1540a8dd5f5c028feb3b4b1c7e5610b" => :yosemite sha256 "fea59d120862f6a04da3993dde1b2f6db60183fc6d7f90f77bb622efdf8a16ac" => :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); }