From: Georg Baum Date: Sun, 2 May 2004 10:13:09 +0000 (+0000) Subject: STLport compile fix for floor() X-Git-Tag: 1.6.10~15255 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=ee3c83ff49e25797f8dabe6e77ade72a8abcfa38;p=lyx.git STLport compile fix for floor() git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8718 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 8e1ce5cdf4..94179c02d0 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,7 @@ +2004-05-02 Georg Baum + + * QGraphics.C: #include (STLport compile fix for floor()) + 2004-04-29 Angus Leeming * QLImage.C (toGray): new helper function, copied from diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index a59f7de911..6ece7d2ddc 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -35,11 +35,17 @@ #include "QGraphics.h" #include "Qt2BC.h" +#include + using lyx::support::float_equal; using lyx::support::strToDbl; using lyx::support::strToInt; using lyx::support::token; +#ifndef CXX_GLOBAL_CSTD +using std::floor; +#endif + using std::vector; using std::string; diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index b550632612..14e7418b2d 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,7 @@ +2004-05-02 Georg Baum + + * FormGraphics.C: #include (STLport compile fix for floor()) + 2004-04-30 Angus Leeming * XFormsToolbar.[Ch]: add code to generate an 'inactive' version diff --git a/src/frontends/xforms/FormGraphics.C b/src/frontends/xforms/FormGraphics.C index 578971d2b3..ed7ac852b0 100644 --- a/src/frontends/xforms/FormGraphics.C +++ b/src/frontends/xforms/FormGraphics.C @@ -35,6 +35,8 @@ #include "lyx_forms.h" +#include + using lyx::support::bformat; using lyx::support::float_equal; using lyx::support::getStringFromVector; @@ -42,6 +44,10 @@ using lyx::support::strToDbl; using lyx::support::strToInt; using lyx::support::token; +#ifndef CXX_GLOBAL_CSTD +using std::floor; +#endif + using std::endl; using std::vector;