X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FPrinterParams.h;h=413201733818616b40aea6514544a15ca0d97d33;hb=cb52251ccff29d6cbfa13ab90a96be566e3f41ac;hp=a5609e262e7e38792309c2df5c9a588e042ca859;hpb=20b05ef8c1e3d73175427405cbc2bb5d3c6d7e90;p=lyx.git diff --git a/src/PrinterParams.h b/src/PrinterParams.h index a5609e262e..4132017338 100644 --- a/src/PrinterParams.h +++ b/src/PrinterParams.h @@ -5,9 +5,9 @@ * LyX, The Document Processor * * Copyright 1995 Matthias Ettrich - * Copyright 1995-2000 The LyX Team + * Copyright 1995-2001 The LyX Team * - * This file Copyright 1999-2000 + * This file Copyright 1999-2001 * Allan Rae *====================================================== */ @@ -94,22 +94,23 @@ struct PrinterParams { #ifdef ENABLE_ASSERTIONS if (!from_page.empty()) { // Assert(from_page == number or empty) - Assert(containsOnly(from_page, "1234567890")); + lyx::Assert(containsOnly(from_page, + "1234567890")); } if (to_page) { // Assert(to_page == empty // or number iff from_page set) - Assert(!from_page.empty()); + lyx::Assert(!from_page.empty()); } switch (target) { case PRINTER: // Assert(!printer_name.empty()); break; case FILE: - Assert(!file_name.empty()); + lyx::Assert(!file_name.empty()); break; default: - Assert(false); + lyx::Assert(false); break; } switch (which_pages) { @@ -118,7 +119,7 @@ struct PrinterParams { case EVEN: break; default: - Assert(false); + lyx::Assert(false); break; } #endif @@ -160,11 +161,6 @@ struct PrinterParams { { testInvariant(); } - -// do we need these? -// friend bool operator==(PrinterParams const &, PrinterParams const &); -// friend bool operator<(PrinterParams const &, PrinterParams const &); - }; #endif