diff --git a/ChangeLog b/ChangeLog index 91ec01fa17..545322f3e0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2001-04-15 Allan Rae + + * Makefile.am (sourcedoc/Doxyfile): ensure modifications to doxygen + configuration file take effect. + (DISTCLEANFILES): clean out sourcedoc/ + + * sourcedoc/Doxyfile.in(FILE_PATTERNS): make sure we only filter + things that should be filtered. Now you can run it after you started + compiling stuff as well. + 2001-03-29 Angus Leeming * configure.in: changed AC_INIT(src/lyx.C) to AC_INIT(src/main.C) diff --git a/Makefile.am b/Makefile.am index 4760fe08e3..6b0b827896 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,8 +1,10 @@ AUTOMAKE_OPTIONS = foreign -DISTCLEANFILES= *.orig *.rej *~ *.bak lyx.1 core +DISTCLEANFILES = -r *.orig *.rej *~ *.bak lyx.1 core $(srcdir)/sourcedoc/*~ \ + $(srcdir)/sourcedoc/html $(srcdir)/sourcedoc/latex \ + $(srcdir)/sourcedoc/man $(srcdir)/sourcedoc/Doxyfile MAINTAINERCLEANFILES = $(srcdir)/Makefile.in $(srcdir)/aclocal.m4 \ $(srcdir)/configure $(srcdir)/development/lyx.spec \ - $(srcdir)/acinclude.m4 + $(srcdir)/acinclude.m4 $(srcdir)/sourcedoc/Doxyfile SUBDIRS = intl po sigc++ boost src lib EXTRA_DIST = ANNOUNCE OLD-CHANGES INSTALL.OS2 INSTALL.autoconf README.OS2 \ @@ -50,10 +52,14 @@ bindist: @echo "*** $(bindistfile) has been created." -sourcedoc: +sourcedoc: sourcedoc/Doxyfile cd sourcedoc; \ doxygen ./Doxyfile +sourcedoc/Doxyfile: sourcedoc/Doxyfile.in config.status + cd $(top_builddir) \ + && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status + lgbtags: etags --totals=yes --recurse=yes -o TAGS $(top_srcdir)/* 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/sourcedoc/Doxyfile.in b/sourcedoc/Doxyfile.in index a58ee03cb4..fa87892325 100644 --- a/sourcedoc/Doxyfile.in +++ b/sourcedoc/Doxyfile.in @@ -251,7 +251,7 @@ INPUT = @top_srcdir@/src # and *.h) to filter out the source-files in the directories. If left # blank all files are included. -FILE_PATTERNS = +FILE_PATTERNS = *.C *.h *.c # The RECURSIVE tag can be used to turn specify whether or not subdirectories # should be searched for input files as well. Possible values are YES and NO. diff --git a/src/ChangeLog b/src/ChangeLog index 71e6b555c0..435f1e7af2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,10 @@ +2001-04-16 Allan Rae + + * tabular-old.C (l_getline): + * spellchecker.C (sc_check_word): + * lyxfunc.C (Dispatch): #warning triggers an error on Sun CC 6.0 as + an unrecognised preprocessor directive. So ensure they're wrapped. + 2001-04-14 Dekel Tsur * src/exporter.C (Export): Give an error message when path to file diff --git a/src/frontends/gnome/ChangeLog b/src/frontends/gnome/ChangeLog index d7869d677c..b3415a712f 100644 --- a/src/frontends/gnome/ChangeLog +++ b/src/frontends/gnome/ChangeLog @@ -1,3 +1,10 @@ +2001-04-16 Allan Rae + + * gnomeBC.C (setButtonLabel): + * Menubar_pimpl.C (updateAllLists): + * GnomeBase.C (loadXML): #warning triggers an error on Sun CC 6.0 as + an unrecognised preprocessor directive. So ensure they're wrapped. + 2001-04-03 Baruch Even * FileDialog.C: Added file to provide the gnome file dialog. diff --git a/src/frontends/gnome/GnomeBase.C b/src/frontends/gnome/GnomeBase.C index 87ace2088f..1872eb1250 100644 --- a/src/frontends/gnome/GnomeBase.C +++ b/src/frontends/gnome/GnomeBase.C @@ -37,7 +37,9 @@ GnomeBase::~GnomeBase() void GnomeBase::loadXML() const { +#ifdef WITH_WARNINGS #warning Change this before declaring it production code! (be 20010325) +#endif string const path("src/frontends/gnome/dialogs/;frontends/gnome/dialogs/;/home/baruch/prog/lyx/graphics/src/frontends/gnome/dialogs/"); string const file = FileOpenSearch(path, file_, "glade"); diff --git a/src/frontends/gnome/Menubar_pimpl.C b/src/frontends/gnome/Menubar_pimpl.C index ff30401f8a..bba908771e 100644 --- a/src/frontends/gnome/Menubar_pimpl.C +++ b/src/frontends/gnome/Menubar_pimpl.C @@ -92,7 +92,9 @@ void Menubar::Pimpl::set(string const & menu_name) void Menubar::Pimpl::updateAllLists() { +#ifdef WITH_WARNINGS #warning Implement me! (be 20010324) +#endif #if 0 // update lists if (toc_.size() > 0) diff --git a/src/frontends/gnome/gnomeBC.C b/src/frontends/gnome/gnomeBC.C index 5d057bfaa8..e9f9f66178 100644 --- a/src/frontends/gnome/gnomeBC.C +++ b/src/frontends/gnome/gnomeBC.C @@ -29,7 +29,9 @@ void gnomeBC::setButtonEnabled(Gtk::Button * btn, bool enabled) void gnomeBC::setButtonLabel(Gtk::Button * obj, string const & label) { +#ifdef WITH_WARNINGS #warning Implement me! (be 20010329) +#endif // There is no methods set_text! //obj->set_text(label); } diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog index 3d3b44cbc3..dee32eaca8 100644 --- a/src/frontends/xforms/ChangeLog +++ b/src/frontends/xforms/ChangeLog @@ -1,3 +1,9 @@ +2001-04-16 Allan Rae + + * xforms_helpers.C (formatted): + * Menubar_pimpl.C (add_toc): #warning triggers an error on Sun CC 6.0 + as an unrecognised preprocessor directive. So ensure they're wrapped. + 2001-04-06 John Levon * FormTabularCreate.C: pass a pair of uints to the controller diff --git a/src/frontends/xforms/Menubar_pimpl.C b/src/frontends/xforms/Menubar_pimpl.C index 87a9222f03..f06aaaee92 100644 --- a/src/frontends/xforms/Menubar_pimpl.C +++ b/src/frontends/xforms/Menubar_pimpl.C @@ -370,7 +370,9 @@ void Menubar::Pimpl::add_toc(int menu, string const & extra_label, add_toc2(menu, extra_label, smn, win, toc_list[0], 0, toc_list[0].size(), 0); #else +#ifdef WITH_WARNINGS #warning Fix Me! (Lgb) +#endif Buffer::Lists toc_list = owner_->buffer()->getLists(); Buffer::Lists::const_iterator cit = toc_list.begin(); Buffer::Lists::const_iterator end = toc_list.end(); diff --git a/src/frontends/xforms/xforms_helpers.C b/src/frontends/xforms/xforms_helpers.C index acbc4ce6d0..ad545ce042 100644 --- a/src/frontends/xforms/xforms_helpers.C +++ b/src/frontends/xforms/xforms_helpers.C @@ -38,7 +38,9 @@ void setEnabled(FL_OBJECT * ob, bool enable) // Take a string and add breaks so that it fits into a desired label width, w string formatted(string const & sin, int w, int size, int style) { +#ifdef WITH_WARNINGS #warning Why cant this be done by a one pass algo? (Lgb) +#endif string sout; if (sin.empty()) return sout; diff --git a/src/graphics/ChangeLog b/src/graphics/ChangeLog index ba29f1ec73..3b8294e796 100644 --- a/src/graphics/ChangeLog +++ b/src/graphics/ChangeLog @@ -1,3 +1,9 @@ +2001-04-16 Allan Rae + + * ImageLoaderXPM.C (runImageLoader): #warning triggers an error on Sun + CC 6.0 as an unrecognised preprocessor directive. So ensure they're + wrapped. + 2001-04-02 Baruch Even * GraphicsCacheItem.[Ch]: Changed to used the Converter class instead diff --git a/src/graphics/ImageLoaderXPM.C b/src/graphics/ImageLoaderXPM.C index 87be5a1b1c..1bef2d2a42 100644 --- a/src/graphics/ImageLoaderXPM.C +++ b/src/graphics/ImageLoaderXPM.C @@ -62,7 +62,9 @@ ImageLoaderXPM::runImageLoader(string const & filename) Display * display = fl_get_display(); //(BE 2000-08-05) +#ifdef WITH_WARNINGS #warning This might be a dirty thing, but I dont know any other solution. +#endif Screen * screen = ScreenOfDisplay(display, fl_screen); Pixmap pixmap; diff --git a/src/insets/ChangeLog b/src/insets/ChangeLog index 86c9d14677..0df54bd375 100644 --- a/src/insets/ChangeLog +++ b/src/insets/ChangeLog @@ -1,3 +1,14 @@ +2001-04-16 Allan Rae + + * insettoc.C (Ascii): + * insettext.C (draw): + * insettabular.C (setPos): + * insetminipage.C (Read): + * insetfloat.C (placement): + * insetcaption.C (Ascii, DocBook): + * figinset.C (runqueue): #warning triggers an error on Sun CC 6.0 as + an unrecognised preprocessor directive. So ensure they're wrapped. + 2001-04-13 Juergen Vigna * insettext.C: tried to avoid unneeded redraws. diff --git a/src/insets/figinset.C b/src/insets/figinset.C index d80165688c..a2c20d44cb 100644 --- a/src/insets/figinset.C +++ b/src/insets/figinset.C @@ -521,8 +521,10 @@ void runqueue() t2 << "GHOSTVIEW=" << fl_get_canvas_id(figinset_canvas) << ' ' << p->data->bitmap; // now set up ghostview property on a window + // #ifdef WITH_WARNINGS // #warning BUG seems that the only bug here // might be the hardcoded dpi.. Bummer! + // #endif ostringstream t1; t1 << "0 0 0 0 " << p->data->wid << ' ' << p->data->hgh << " 72 72 0 0 0 0"; diff --git a/src/insets/insetcaption.C b/src/insets/insetcaption.C index 16c485077c..bc8ee48a57 100644 --- a/src/insets/insetcaption.C +++ b/src/insets/insetcaption.C @@ -114,13 +114,17 @@ int InsetCaption::Latex(Buffer const * buf, ostream & os, int InsetCaption::Ascii(Buffer const * /*buf*/, ostream & /*os*/, int /*linelen*/) const { +#ifdef WITH_WARNINGS #warning Implement me! +#endif return 0; } int InsetCaption::DocBook(Buffer const * /*buf*/, ostream & /*os*/) const { +#ifdef WITH_WARNINGS #warning Implement me! +#endif return 0; } diff --git a/src/insets/insetfloat.C b/src/insets/insetfloat.C index e4f9803d48..029e86c22d 100644 --- a/src/insets/insetfloat.C +++ b/src/insets/insetfloat.C @@ -230,7 +230,9 @@ void InsetFloat::placement(string const & p) { // Here we should only allow the placement to be set // if a valid value. +#ifdef WITH_WARNINGS #warning FIX! +#endif floatPlacement_ = p; } diff --git a/src/insets/insetminipage.C b/src/insets/insetminipage.C index 19a355b64d..bb154b4251 100644 --- a/src/insets/insetminipage.C +++ b/src/insets/insetminipage.C @@ -149,7 +149,9 @@ void InsetMinipage::Read(Buffer const * buf, LyXLex & lex) << endl; } } +#ifdef WITH_WARNINGS #warning Remove me before final 1.2.0 (Jug) +#endif // this is only for compatibility to the intermediate format and should // vanish till the final 1.2.0! if (lex.IsOK()) { diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index 752e0d8565..dc9f2bc45a 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -1236,7 +1236,9 @@ void InsetTabular::setPos(BufferView * bv, int x, int y) const int lx = tabular->GetWidthOfColumn(actcell) - tabular->GetAdditionalWidth(actcell); #if 0 +#ifdef WITH_WARNINGS #warning Jürgen, can you rewrite this to _not_ use the sequencing operator. (Lgb) +#endif for (; !tabular->IsLastCellInRow(actcell) && (lx < x); ++actcell,lx += tabular->GetWidthOfColumn(actcell) + tabular->GetAdditionalWidth(actcell - 1)); diff --git a/src/insets/insettext.C b/src/insets/insettext.C index 33ffcfa753..4484a9cca2 100644 --- a/src/insets/insettext.C +++ b/src/insets/insettext.C @@ -384,8 +384,10 @@ void InsetText::draw(BufferView * bv, LyXFont const & f, } x += TEXT_TO_INSET_OFFSET; +#ifdef WITH_WARNINGS #warning Jürgen, why is this a block of its own? (Lgb) -#warning because you told me to define variables only in local contest (Jug)! +#warning because you told me to define variables only in local context (Jug)! +#endif { int y = 0; Row * row = TEXT(bv)->GetRowNearY(y); diff --git a/src/insets/insettoc.C b/src/insets/insettoc.C index 4f03775ddb..74be043cf6 100644 --- a/src/insets/insettoc.C +++ b/src/insets/insettoc.C @@ -71,7 +71,9 @@ int InsetTOC::Ascii(Buffer const * buffer, std::ostream & os, int) const it != toc.end(); ++it) os << string(4 * it->depth, ' ') << it->str << endl; #else +#ifdef WITH_WARNINGS #warning Fix Me! (Lgb) +#endif string type; string const cmdname = getCmdName(); if (cmdname == "tableofcontents" ) diff --git a/src/lyxfunc.C b/src/lyxfunc.C index c31da43748..285af55c54 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -999,7 +999,9 @@ string const LyXFunc::Dispatch(int ac, owner->view()->allFloats(0,1); break; #else +#ifdef WITH_WARNINGS #warning Find another implementation here (or another lyxfunc)! +#endif #endif case LFUN_HELP_COPYRIGHT: owner->getDialogs()->showCopyright(); diff --git a/src/mathed/ChangeLog b/src/mathed/ChangeLog index 069ec8e697..c65f7aa00d 100644 --- a/src/mathed/ChangeLog +++ b/src/mathed/ChangeLog @@ -1,3 +1,10 @@ +2001-04-16 Allan Rae + + * formula.C (Latex, getLabelList, LocalDispatch): + * math_parser.C (mathed_parse): + * math_parinset.C (Write): #warning triggers an error on Sun CC 6.0 as + an unrecognised preprocessor directive. So ensure they're wrapped. + 2001-04-04 Lars Gullik Bjønnes * formula.C (draw): adjust for cursor_visible diff --git a/src/mathed/formula.C b/src/mathed/formula.C index 2e54f1cb99..e4fc8957f9 100644 --- a/src/mathed/formula.C +++ b/src/mathed/formula.C @@ -262,8 +262,10 @@ void InsetFormula::Write(Buffer const * buf, ostream & os) const int InsetFormula::Latex(Buffer const *, ostream & os, bool fragile, bool) const { + //#ifdef WITH_WARNINGS //#warning Alejandro, the number of lines is not returned in this case // This problem will disapear at 0.13. + //#endif return mathed_write(par, os, fragile, label_); } @@ -556,8 +558,10 @@ void InsetFormula::display(bool dspf) vector const InsetFormula::getLabelList() const { + //#ifdef WITH_WARNINGS //#warning This is dirty, I know. Ill clean it at 0.11 // Correction, the only way to clean this is with a new kernel: 0.13. + //#endif vector label_list; @@ -895,7 +899,9 @@ InsetFormula::LocalDispatch(BufferView * bv, kb_action action, //BUG // mt->SetNumbered(!mt->IsNumbered()); +#ifdef WITH_WARNINGS #warning This is a terrible hack! We should find a better solution. +#endif while (mathcursor->getLabel() == MathedXIter::error_label) { if (LocalDispatch(bv, LFUN_LEFT, string()) == FINISHED) return DISPATCHED; @@ -1023,7 +1029,9 @@ InsetFormula::LocalDispatch(BufferView * bv, kb_action action, string old_label = is_multiline(par->GetType()) ? mathcursor->getLabel() : label_; +#ifdef WITH_WARNINGS #warning This is a terrible hack! We should find a better solution. +#endif // This is needed because in some positions // mathcursor->cursor->crow is equal to 0, and therefore // the label cannot be inserted. diff --git a/src/mathed/math_parinset.C b/src/mathed/math_parinset.C index 20309ff6f2..6d7021a729 100644 --- a/src/mathed/math_parinset.C +++ b/src/mathed/math_parinset.C @@ -296,7 +296,9 @@ void MathParInset::Write(ostream & os, bool fragile) if (l) { os << '\\' << l->name << ' '; } else { +#ifdef WITH_WARNINGS #warning this does not compile on gcc 2.97 +#endif //lyxerr << "Illegal symbol code[" << c // << " " << str.end() - s << " " << data.fcode() << "]"; } diff --git a/src/mathed/math_parser.C b/src/mathed/math_parser.C index c3827dffbd..f67700da4b 100644 --- a/src/mathed/math_parser.C +++ b/src/mathed/math_parser.C @@ -134,7 +134,9 @@ enum lexcode_enum { lexcode_enum lexcode[256]; +#ifdef WITH_WARNINGS #warning Replace with string +#endif //char yytext[256]; array yytext; int yylineno; @@ -626,7 +628,9 @@ void mathed_parse(MathedArray & array, unsigned flags = 0, if (accent) { data.insertInset(doAccent(bg), LM_TC_INSET); } else { +#ifdef WITH_WARNINGS #warning This is suspisious! (Lgb) +#endif // it should not take a bool as second arg (Lgb) data.insertInset(bg, true); } diff --git a/src/spellchecker.C b/src/spellchecker.C index 609aa93502..989c1cd690 100644 --- a/src/spellchecker.C +++ b/src/spellchecker.C @@ -633,7 +633,9 @@ void sc_clean_up_after_error() isp_result * sc_check_word(string const & word) { isp_result * result = new isp_result; +#ifdef WITH_WARNINGS #warning Why isnt word_ok a bool? (Lgb) +#endif int word_ok = pspell_manager_check(sc, word.c_str()); Assert(word_ok != -1); diff --git a/src/support/ChangeLog b/src/support/ChangeLog index b365c07c28..500846e5e1 100644 --- a/src/support/ChangeLog +++ b/src/support/ChangeLog @@ -1,3 +1,8 @@ +2001-04-16 Allan Rae + + * tempname.C (make_tempfile): #warning triggers an error on Sun CC 6.0 + as an unrecognised preprocessor directive. So ensure they're wrapped. + 2001-03-15 Lars Gullik Bjønnes * several files: remove CXX_WORKING_NAMESPACES diff --git a/src/support/tempname.C b/src/support/tempname.C index 791e586bd9..9c7f3824fc 100644 --- a/src/support/tempname.C +++ b/src/support/tempname.C @@ -25,9 +25,11 @@ int make_tempfile(char * templ) ::mktemp(templ); return ::open(templ, O_CREAT | O_EXCL, S_IRUSR | S_IWUSR); #else +#ifdef WITH_WARNINGS #warning FIX FIX FIX #endif #endif +#endif } } // namespace anon diff --git a/src/tabular-old.C b/src/tabular-old.C index 9bdf96ccd6..7ec6fbd2d0 100644 --- a/src/tabular-old.C +++ b/src/tabular-old.C @@ -125,7 +125,9 @@ bool getTokenValue(string const & str, const char * token, bool & flag) inline void l_getline(istream & is, string & str) { +#ifdef WITH_WARNINGS #warning old l_getline +#endif getline(is, str); while(str.empty()) getline(is, str);