From 5b60445aaec6694fc5bc6ee56b335dc1f1f36062 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Lars=20Gullik=20Bj=C3=B8nnes?= Date: Fri, 23 Jul 2004 22:31:14 +0000 Subject: [PATCH] use size_t instead of int to avoid a singed/unsigned warning git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8848 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/mathed/ChangeLog | 9 +++++++++ src/mathed/math_macroarg.C | 3 ++- src/mathed/math_macroarg.h | 6 +++--- src/mathed/math_macrotable.C | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 905a9acda0..d3d2d442dc 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,12 @@ +2004-07-24 Lars Gullik Bjonnes + + * math_macrotable.C (expand): n is now size_t + + * math_macroarg.h (number): return size_t + (number_): make it a size_t + + * math_macroarg.[Ch] (MathMacroArgument): take size_t as arg + 2004-05-28 Lars Gullik Bjonnes * Makefile.am (EXTRA_DIST): add formulamacro.C diff --git a/src/mathed/math_macroarg.C b/src/mathed/math_macroarg.C index f6b720473b..777bb5c94c 100644 --- a/src/mathed/math_macroarg.C +++ b/src/mathed/math_macroarg.C @@ -19,9 +19,10 @@ using std::endl; using std::auto_ptr; +using std::size_t; -MathMacroArgument::MathMacroArgument(int n) +MathMacroArgument::MathMacroArgument(size_t n) : number_(n) { if (n < 1 || n > 9) { diff --git a/src/mathed/math_macroarg.h b/src/mathed/math_macroarg.h index 434c3fd8db..d7d763d878 100644 --- a/src/mathed/math_macroarg.h +++ b/src/mathed/math_macroarg.h @@ -20,7 +20,7 @@ class MathMacroArgument : public MathDimInset { public: /// - explicit MathMacroArgument(int); + explicit MathMacroArgument(std::size_t); /// std::auto_ptr clone() const; /// @@ -28,7 +28,7 @@ public: /// void draw(PainterInfo &, int x, int y) const; /// - int number() const { return number_; } + std::size_t number() const { return number_; } /// InsetBase::Code lyxCode() const { return MATHMACROARG_CODE; } @@ -39,7 +39,7 @@ public: private: /// A number between 1 and 9 - int number_; + std::size_t number_; /// char str_[3]; }; diff --git a/src/mathed/math_macrotable.C b/src/mathed/math_macrotable.C index 001b64e3ae..09930bd598 100644 --- a/src/mathed/math_macrotable.C +++ b/src/mathed/math_macrotable.C @@ -29,6 +29,7 @@ using std::map; using std::pair; using std::string; using std::vector; +using std::size_t; MacroData::MacroData() @@ -54,7 +55,7 @@ void MacroData::expand(vector const & args, MathArray & to) const continue; //it.cell().erase(it.pos()); //it.cell().insert(it.pos(), it.nextInset()->asMathInset() - int n = static_cast(it.nextInset())->number(); + size_t n = static_cast(it.nextInset())->number(); if (n <= args.size()) { it.cell().erase(it.pos()); it.cell().insert(it.pos(), args[n - 1]); @@ -65,7 +66,6 @@ void MacroData::expand(vector const & args, MathArray & to) const } - // The global table. MacroTable & MacroTable::globalMacros() { -- 2.39.2