From ad55c51a3e304a626ee0c0b35495c1840d662e22 Mon Sep 17 00:00:00 2001 From: Jinhao Date: Wed, 21 Jun 2017 22:42:22 +0800 Subject: [PATCH] small fixes --- build/makefile/makefile | 1 - include/nana/gui/widgets/listbox.hpp | 14 +++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/build/makefile/makefile b/build/makefile/makefile index 9f0fb052..0cdc8d1d 100644 --- a/build/makefile/makefile +++ b/build/makefile/makefile @@ -8,7 +8,6 @@ SRCROOT = ../../source EXTRLIB = ../../extrlib NANA_INC= $(INCROOT)/nana OUTROOT = out -#CXXFLAGS= -g -std=c++11 -Wall CXXFLAGS= -g -fexceptions -std=c++11 -Wall -Wextra -Wunused-variable -Wfatal-errors INCS = -I$(INCROOT) -I/usr/include/freetype2 -I$(EXTRLIB) diff --git a/include/nana/gui/widgets/listbox.hpp b/include/nana/gui/widgets/listbox.hpp index 552b2e36..b6417524 100644 --- a/include/nana/gui/widgets/listbox.hpp +++ b/include/nana/gui/widgets/listbox.hpp @@ -186,7 +186,7 @@ namespace nana public: virtual ~container_interface() = default; - virtual void clear() noexcept = 0; + virtual void clear() = 0; virtual void erase(std::size_t pos) = 0; virtual std::size_t size() const = 0; @@ -238,7 +238,7 @@ namespace nana translator_({ vtrans, ctrans }) {} private: - void clear() noexcept override + void clear() override { container_.clear(); } @@ -246,7 +246,7 @@ namespace nana void erase(std::size_t pos) override { auto i = container_.begin(); - std::advance(i, static_cast(pos)); + std::advance(i, pos); container_.erase(i); } @@ -263,7 +263,7 @@ namespace nana void emplace(std::size_t pos) override { auto i = container_.begin(); - std::advance(i, static_cast(pos)); + std::advance(i, pos); container_.emplace(i); } @@ -327,7 +327,7 @@ namespace nana } private: - void clear() noexcept override + void clear() override { container_.clear(); } @@ -335,7 +335,7 @@ namespace nana void erase(std::size_t pos) override { auto i = container_.begin(); - std::advance(i, static_cast(pos)); + std::advance(i, pos); container_.erase(i); } @@ -352,7 +352,7 @@ namespace nana void emplace(std::size_t pos) override { auto i = container_.begin(); - std::advance(i, static_cast(pos)); + std::advance(i, pos); container_.emplace(i); }