From b0da75ab1e6ed0e5a14d89e8f2573cfad32498e0 Mon Sep 17 00:00:00 2001 From: Jean-Marc Lasgouttes Date: Wed, 2 May 2001 10:47:07 +0000 Subject: [PATCH] help a bit compilation with sun CC git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@1976 a592a061-630c-0410-9148-cb99ea01b6c8 --- po/POTFILES.in | 60 +++++++++++++++++++++---------------------- src/ChangeLog | 5 ++++ src/lyx_main.C | 4 +++ src/mathed/ChangeLog | 3 +++ src/mathed/matriz.C | 5 +++- src/support/ChangeLog | 6 +++++ src/support/atoi.C | 3 +++ src/support/fmt.C | 4 +++ 8 files changed, 59 insertions(+), 31 deletions(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index f2125c4e5f..f94c783564 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -10,8 +10,8 @@ src/CutAndPaste.C src/debug.C src/exporter.C src/ext_l10n.h -src/figure_form.C src/figureForm.C +src/figure_form.C src/FontLoader.C src/frontends/controllers/ButtonController.h src/frontends/controllers/character.C @@ -90,67 +90,67 @@ src/frontends/qt2/paragraphdlgimpl.C src/frontends/qt2/tabularcreatedlgimpl.C src/frontends/xforms/combox.C src/frontends/xforms/FileDialog.C -src/frontends/xforms/form_bibitem.C src/frontends/xforms/FormBibitem.C -src/frontends/xforms/form_bibtex.C +src/frontends/xforms/form_bibitem.C src/frontends/xforms/FormBibtex.C +src/frontends/xforms/form_bibtex.C src/frontends/xforms/form_browser.C -src/frontends/xforms/form_character.C src/frontends/xforms/FormCharacter.C -src/frontends/xforms/form_citation.C +src/frontends/xforms/form_character.C src/frontends/xforms/FormCitation.C -src/frontends/xforms/form_copyright.C +src/frontends/xforms/form_citation.C src/frontends/xforms/FormCopyright.C -src/frontends/xforms/form_credits.C +src/frontends/xforms/form_copyright.C src/frontends/xforms/FormCredits.C -src/frontends/xforms/form_document.C +src/frontends/xforms/form_credits.C src/frontends/xforms/FormDocument.C -src/frontends/xforms/form_error.C +src/frontends/xforms/form_document.C src/frontends/xforms/FormError.C -src/frontends/xforms/form_external.C +src/frontends/xforms/form_error.C src/frontends/xforms/FormExternal.C -src/frontends/xforms/form_filedialog.C +src/frontends/xforms/form_external.C src/frontends/xforms/FormFiledialog.C -src/frontends/xforms/form_graphics.C +src/frontends/xforms/form_filedialog.C src/frontends/xforms/FormGraphics.C -src/frontends/xforms/form_include.C +src/frontends/xforms/form_graphics.C src/frontends/xforms/FormInclude.C -src/frontends/xforms/form_index.C +src/frontends/xforms/form_include.C src/frontends/xforms/FormIndex.C +src/frontends/xforms/form_index.C src/frontends/xforms/FormLog.C src/frontends/xforms/FormMathsBitmap.C -src/frontends/xforms/form_maths_deco.C src/frontends/xforms/FormMathsDeco.C -src/frontends/xforms/form_maths_delim.C +src/frontends/xforms/form_maths_deco.C src/frontends/xforms/FormMathsDelim.C -src/frontends/xforms/form_maths_matrix.C +src/frontends/xforms/form_maths_delim.C src/frontends/xforms/FormMathsMatrix.C -src/frontends/xforms/form_maths_panel.C +src/frontends/xforms/form_maths_matrix.C src/frontends/xforms/FormMathsPanel.C -src/frontends/xforms/form_maths_space.C +src/frontends/xforms/form_maths_panel.C src/frontends/xforms/FormMathsSpace.C -src/frontends/xforms/form_minipage.C +src/frontends/xforms/form_maths_space.C src/frontends/xforms/FormMinipage.C -src/frontends/xforms/form_paragraph.C +src/frontends/xforms/form_minipage.C src/frontends/xforms/FormParagraph.C -src/frontends/xforms/form_preamble.C +src/frontends/xforms/form_paragraph.C src/frontends/xforms/FormPreamble.C -src/frontends/xforms/form_preferences.C +src/frontends/xforms/form_preamble.C src/frontends/xforms/FormPreferences.C -src/frontends/xforms/form_print.C +src/frontends/xforms/form_preferences.C src/frontends/xforms/FormPrint.C -src/frontends/xforms/form_ref.C +src/frontends/xforms/form_print.C src/frontends/xforms/FormRef.C -src/frontends/xforms/form_search.C +src/frontends/xforms/form_ref.C src/frontends/xforms/FormSearch.C -src/frontends/xforms/form_tabular.C +src/frontends/xforms/form_search.C src/frontends/xforms/FormTabular.C -src/frontends/xforms/form_tabular_create.C +src/frontends/xforms/form_tabular.C src/frontends/xforms/FormTabularCreate.C -src/frontends/xforms/form_toc.C +src/frontends/xforms/form_tabular_create.C src/frontends/xforms/FormToc.C -src/frontends/xforms/form_url.C +src/frontends/xforms/form_toc.C src/frontends/xforms/FormUrl.C +src/frontends/xforms/form_url.C src/frontends/xforms/FormVCLog.C src/frontends/xforms/input_validators.C src/frontends/xforms/Menubar_pimpl.C diff --git a/src/ChangeLog b/src/ChangeLog index 544e760154..e7f2bf3e30 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2001-05-02 Jean-Marc Lasgouttes + + * lyx_main.C: add using directives when needed for C functions + declared in std:: namespace. + 2001-04-27 Juergen Vigna * text.C (Fill): return 20 instead of 0 if paper_width < 0 (endless) diff --git a/src/lyx_main.C b/src/lyx_main.C index 17b1ea260f..5dd5799233 100644 --- a/src/lyx_main.C +++ b/src/lyx_main.C @@ -44,6 +44,10 @@ using std::endl; +#ifndef CXX_GLOBAL_CSTD +using std::signal; +#endif + extern void LoadLyXFile(string const &); extern void QuitLyX(); diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 0ff21c4b8c..a5fb2aeae9 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,5 +1,8 @@ 2001-05-02 Jean-Marc Lasgouttes + * matriz.C: add using directives when needed for C functions + declared in std:: namespace. + * math_macrotemplate.h: do not use explicitely std::string, but string. diff --git a/src/mathed/matriz.C b/src/mathed/matriz.C index e3692c27af..3fe13a03f1 100644 --- a/src/mathed/matriz.C +++ b/src/mathed/matriz.C @@ -4,7 +4,10 @@ #include "matriz.h" - +#ifndef CXX_GLOBAL_CSTD +using std::memcpy; +#endif + namespace { inline diff --git a/src/support/ChangeLog b/src/support/ChangeLog index e84f04f151..084424bf3b 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,9 @@ +2001-05-02 Jean-Marc Lasgouttes + + * fmt.C: + * atoi.C: add using directives when needed for C functions + declared in std:: namespace. + 2001-04-25 Lars Gullik Bjønnes * lstrings.C : add two helper structs, local_lowercase and diff --git a/src/support/atoi.C b/src/support/atoi.C index 17f9847cce..949dee0711 100644 --- a/src/support/atoi.C +++ b/src/support/atoi.C @@ -4,6 +4,9 @@ #include "lyxlib.h" +#ifndef CXX_GLOBAL_CSTD +using std::atoi; +#endif int lyx::atoi(string const & nstr) { diff --git a/src/support/fmt.C b/src/support/fmt.C index d982681168..cc66835ba2 100644 --- a/src/support/fmt.C +++ b/src/support/fmt.C @@ -8,6 +8,10 @@ #include "LString.h" +#ifndef CXX_GLOBAL_CSTD +using std::va_list; +#endif + /* This output manipulator gives the option to use Old style format specifications in ostreams. Note that this is done at the expense of typesafety, so if possible this manipulator should be avoided.