Merge branch 'some_fixes_marked_by_windows_compiler' into 'master'

Some fixes marked by windows compiler

See merge request integer/scip!3473

Author: pfetsch

applications/Scheduler/src/reader_cmin.h

@@ -21,11 +21,10 @@
 /*  along with SCIP; see the file LICENSE. If not visit scipopt.org.         */
 /*                                                                           */
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
-#pragma ident "@(#) $Id: reader_cmin.h,v 1.1.1.1 2010/10/08 10:29:59 bzfheinz Exp $"
 
 /**@file   reader_cmin.h
  * @brief  cmin file reader
- * @author 
+ * @author Stefan Heinz
  */
 
 /*---+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8----+----9----+----0----+----1----+----2*/

src/scip/debug.c

@@ -121,21 +121,21 @@ SCIP_Bool debugSolutionAvailable(
    debugsoldata = SCIPsetGetDebugSolData(set);
 
    /* check whether a debug solution is specified */
-    if( strcmp(set->misc_debugsol, "-") == 0 )
-    {
-       if( !debugsoldata->warningprinted )
-       {
-          SCIPmessagePrintWarning(SCIPgetMessagehdlr(set->scip), "SCIP is compiled with 'DEBUGSOL=true' but no debug solution is given:\n ");
-          SCIPmessagePrintWarning(SCIPgetMessagehdlr(set->scip), "*** Please set the parameter 'misc/debugsol' and reload the problem again to use the debugging-mechanism ***\n\n");
-          debugsoldata->warningprinted = TRUE;
-       }
-       return FALSE;
-    }
-    else
-    {
-       debugsoldata->warningprinted = FALSE;
-       return TRUE;
-    }
+   if( strcmp(set->misc_debugsol, "-") == 0 )
+   {
+      if( !debugsoldata->warningprinted )
+      {
+         SCIPmessagePrintWarning(SCIPgetMessagehdlr(set->scip), "SCIP is compiled with 'DEBUGSOL=true' but no debug solution is given:\n");
+         SCIPmessagePrintWarning(SCIPgetMessagehdlr(set->scip), "*** Please set the parameter 'misc/debugsol' and reload the problem again to use the debugging-mechanism ***\n\n");
+         debugsoldata->warningprinted = TRUE;
+      }
+      return FALSE;
+   }
+   else
+   {
+      debugsoldata->warningprinted = FALSE;
+      return TRUE;
+   }
 }
 
 /** reads solution from given file into given arrays */

src/scip/reader_fzn.c

@@ -4230,7 +4230,7 @@ SCIP_RETCODE printLinearCons(
    return SCIP_OKAY;
 }
 
-/* writes problem to a flatzinc conform file, including introduction of several auxiliary variables and constraints */
+/** writes problem to a flatzinc conforming file, including introduction of several auxiliary variables and constraints */
 static
 SCIP_RETCODE writeFzn(
    SCIP*                 scip,               /**< SCIP data structure */
@@ -4338,7 +4338,7 @@ SCIP_RETCODE writeFzn(
          }
          else
          {
-            /* Real valued bounds have to be made type conform */
+            /* real valued bounds have to be made type conforming */
             if( fixed )
             {
                flattenFloat(scip, lb, buffy);
@@ -4879,7 +4879,7 @@ SCIP_DECL_READERWRITE(readerWriteFzn)
 
       legal = TRUE;
 
-      /* Scan whether all variable names are flatzinc conform */
+      /* scan whether all variable names are flatzinc conforming */
       for( i = 0; i < nvars; i++ )
       {
          const char* varname;
@@ -4890,7 +4890,7 @@ SCIP_DECL_READERWRITE(readerWriteFzn)
          legal = isIdentifier(varname);
          if( !legal )
          {
-            SCIPwarningMessage(scip, "The name of variable <%d>: \"%s\" is not conform to the fzn standard.\n", i, varname);
+            SCIPwarningMessage(scip, "The name of variable <%d>: \"%s\" does not conform to the fzn standard.\n", i, varname);
             break;
          }
 
@@ -4903,7 +4903,7 @@ SCIP_DECL_READERWRITE(readerWriteFzn)
          }
       }
 
-      /* If there is at least one name, which is not conform, use generic names */
+      /* if there is at least one name, which does not conform, use generic names */
       if( legal )
       {
          SCIP_CALL( writeFzn(scip, file, name, transformed, objsense, objscale, objoffset, vars,