Bracket some #warning directives with WITH_WARNINGS

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@267 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index d35b9ce46d621c57bf0679ac76d5ee86eca2674b..58772aa88632f800cab4eb988d55e7f72cf81139 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+1999-10-28  Jean-Marc Lasgouttes  <Jean-Marc.Lasgouttes@inria.fr>
+
+       * src/support/syscall.C (Systemcalls::kill): 
+         src/support/filetools.C (PutEnv, PutEnvPath): 
+         src/lyx_cb.C (addNewlineAndDepth): 
+         src/FontInfo.C (FontInfo::resize): condition some #warning
+       directives with WITH_WARNINGS.
+       
+
 1999-10-28  Lars Gullik Bjønnes  <larsbj@lyx.org>
 
        * src/form1.C (create_form_Figure): added a couple fo "no-c-format"

diff --git a/INSTALL b/INSTALL
index f9e6b2579b7ec774a55462e237175d09cc606fd9..36e5ae3ef6c71934ef4b138a9fbce185fe0af6ef 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -63,9 +63,6 @@ to compile LyX are gcc 2.8.1 and 2.95.x, the various versions of egcs
 and Digital C++ version 6.1. Please tell us your experience with other
 compilers. 
 
-If you compile LyX with gcc, you should not need to have libg++ installed 
-on most systems.  However, see the note in the section `Problems'.
-
 If you make modifications to files in src/ (for example by applying a 
 patch), you will need to have the GNU gettext package installed, due to 
 some dependencies in the makefiles. You can find the latest (alpha) 

diff --git a/src/FontInfo.C b/src/FontInfo.C
index aba45bec468dc792cc326e77bc68125563268b98..7ac5e6bb29ab99701e765aa1f267425599e223bb 100644 (file)
--- a/src/FontInfo.C
+++ b/src/FontInfo.C
@@ -70,7 +70,9 @@ string FontInfo::getFontname(int size)
 /// Build newly sized font string 
 string FontInfo::resize(string const & font, int size) const {
        // Find the position of the size spec
+#ifdef WITH_WARNINGS
 #warning rewrite to use std::string constructs
+#endif
        int cut = 0, before = 0, after = 0;
        for (string::size_type i = 0; i < font.length(); ++i) {
                if (font[i] == '-') {

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index fdb155bbd55e1a8d9d83b85992a9e7539780282f..8b46912c9bd9ceb136885cc7c151b3f51bb408d1 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -4071,7 +4071,9 @@ void UpdateInsetUpdateList()
        InsetUpdateList = 0;
 }
 
+#ifdef WITH_WARNINGS
 #warning UGLY!!
+#endif
 // I know we shouldn't put anything in here but this seems the fastest
 // way to do this (and the cleanest for now). This function just inserts
 // a newline in the string and the inserts 'depth'-spaces so that the

diff --git a/src/support/filetools.C b/src/support/filetools.C
index 0057188406bd5f685680854753d0d763393d71ca..bc295d32c07bb1dc5f466b869bfd18034e4f439c 100644 (file)
--- a/src/support/filetools.C
+++ b/src/support/filetools.C
@@ -307,7 +307,9 @@ string GetEnvPath(string const & name)
 
 bool PutEnv(string const & envstr)
 {
+#ifdef WITH_WARNINGS
 #warning Look at and fix this.
+#endif
         // f.ex. what about error checking?
         int retval = 0;
 #if HAVE_PUTENV
@@ -329,7 +331,9 @@ bool PutEnv(string const & envstr)
 bool PutEnvPath(string const & envstr)
 {
         string pathlist = envstr;
+#ifdef WITH_WARNINGS
 #warning Verify that this is correct.
+#endif
 #ifdef __EMX__
         pathlist = subst(pathlist, ':', ';');
         pathlist = subst(pathlist, '/', '\\');

diff --git a/src/support/syscall.C b/src/support/syscall.C
index c5c99eadead36a5b089b2d9fedcefef51a35e616..8b18c28704b51bdf7fe78431d27c2bdf49b8537e 100644 (file)
--- a/src/support/syscall.C
+++ b/src/support/syscall.C
@@ -92,7 +92,9 @@ void Systemcalls::kill(int tolerance) {
                // Here, we should add the PID to a list of
                // waiting processes to kill if they are not
                // dead without tolerance seconds
+#ifdef WITH_WARNINGS
 #warning Implement this using the timer of the singleton systemcontroller (Asger)
+#endif
        }
 }