From: tgdwyer <tgdwyer@users.sourceforge.net>
Date: Wed, 1 Feb 2006 04:00:20 +0000 (+0000)
Subject: Added consts to args of pairing heap compare fn
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=21feb657e8b7ddfdd47d5bcec0f1d9fb3955b8f1;p=inkscape.git

Added consts to args of pairing heap compare fn
---

diff --git a/mkinstalldirs b/mkinstalldirs
index 5d26a485f..d2d5f21b6 100755
--- a/mkinstalldirs
+++ b/mkinstalldirs
@@ -1,33 +1,21 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-
-scriptversion=2005-02-02.21
-
-# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
+# Author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain.
-#
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
+# Public domain
 
 errstatus=0
 dirmode=""
 
 usage="\
-Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-
-Create each directory DIR (with mode MODE, if specified), including all
-leading file name components.
-
-Report bugs to <bug-automake@gnu.org>."
+Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
 
 # process command line arguments
 while test $# -gt 0 ; do
   case $1 in
     -h | --help | --h*)         # -h for help
-      echo "$usage"
-      exit $?
+      echo "$usage" 1>&2
+      exit 0
       ;;
     -m)                         # -m PERM arg
       shift
@@ -35,10 +23,6 @@ while test $# -gt 0 ; do
       dirmode=$1
       shift
       ;;
-    --version)
-      echo "$0 $scriptversion"
-      exit $?
-      ;;
     --)                         # stop option processing
       shift
       break
@@ -66,37 +50,17 @@ case $# in
   0) exit 0 ;;
 esac
 
-# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
-# mkdir -p a/c at the same time, both will detect that a is missing,
-# one will create a, then the other will try to create a and die with
-# a "File exists" error.  This is a problem when calling mkinstalldirs
-# from a parallel make.  We use --version in the probe to restrict
-# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
   '')
-    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+    if mkdir -p -- . 2>/dev/null; then
       echo "mkdir -p -- $*"
       exec mkdir -p -- "$@"
-    else
-      # On NextStep and OpenStep, the `mkdir' command does not
-      # recognize any option.  It will interpret all options as
-      # directories to create, and then abort because `.' already
-      # exists.
-      test -d ./-p && rmdir ./-p
-      test -d ./--version && rmdir ./--version
     fi
     ;;
   *)
-    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
-       test ! -d ./--version; then
+    if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
       echo "mkdir -m $dirmode -p -- $*"
       exec mkdir -m "$dirmode" -p -- "$@"
-    else
-      # Clean up after NextStep and OpenStep mkdir.
-      for d in ./-m ./-p ./--version "./$dirmode";
-      do
-        test -d $d && rmdir $d
-      done
     fi
     ;;
 esac
@@ -120,17 +84,17 @@ do
       mkdir "$pathcomp" || lasterr=$?
 
       if test ! -d "$pathcomp"; then
-	errstatus=$lasterr
+  	errstatus=$lasterr
       else
-	if test ! -z "$dirmode"; then
+  	if test ! -z "$dirmode"; then
 	  echo "chmod $dirmode $pathcomp"
-	  lasterr=""
-	  chmod "$dirmode" "$pathcomp" || lasterr=$?
+    	  lasterr=""
+  	  chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-	  if test ! -z "$lasterr"; then
-	    errstatus=$lasterr
-	  fi
-	fi
+  	  if test ! -z "$lasterr"; then
+  	    errstatus=$lasterr
+  	  fi
+  	fi
       fi
     fi
 
@@ -143,8 +107,5 @@ exit $errstatus
 # Local Variables:
 # mode: shell-script
 # sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
 # End:
+# mkinstalldirs ends here
diff --git a/src/removeoverlap/constraint.h b/src/removeoverlap/constraint.h
index 8760dcdf6..683d66da3 100644
--- a/src/removeoverlap/constraint.h
+++ b/src/removeoverlap/constraint.h
@@ -33,7 +33,7 @@ public:
 };
 #include <float.h>
 #include "block.h"
-static inline bool compareConstraints(Constraint *&l, Constraint *&r) {
+static inline bool compareConstraints(Constraint *const &l, Constraint *const &r) {
 	double const sl = 
 		l->left->block->timeStamp > l->timeStamp
 		||l->left->block==l->right->block
diff --git a/src/removeoverlap/pairingheap/PairingHeap.cpp b/src/removeoverlap/pairingheap/PairingHeap.cpp
index 9c67f44fa..e0db8fdaf 100644
--- a/src/removeoverlap/pairingheap/PairingHeap.cpp
+++ b/src/removeoverlap/pairingheap/PairingHeap.cpp
@@ -28,7 +28,7 @@ using namespace std;
 * Construct the pairing heap.
 */
 template <class T>
-PairingHeap<T>::PairingHeap( bool (*lessThan)(T &lhs, T &rhs) )
+PairingHeap<T>::PairingHeap( bool (*lessThan)(T const &lhs, T const &rhs) )
 {
 	root = NULL;
 	counter=0;
diff --git a/src/removeoverlap/pairingheap/PairingHeap.h b/src/removeoverlap/pairingheap/PairingHeap.h
index 2f68c2b6f..5f57f2f1b 100644
--- a/src/removeoverlap/pairingheap/PairingHeap.h
+++ b/src/removeoverlap/pairingheap/PairingHeap.h
@@ -57,14 +57,14 @@ template <class T>
 class Comparator
 {
 public:
-	virtual bool isLessThan(T &lhs, T &rhs) const = 0;
+	virtual bool isLessThan(T const &lhs, T const &rhs) const = 0;
 };
 
 template <class T>
 class PairingHeap
 {
 public:
-	PairingHeap( bool (*lessThan)(T &lhs, T &rhs) );
+	PairingHeap( bool (*lessThan)(T const &lhs, T const &rhs) );
 	PairingHeap( const PairingHeap & rhs );
 	~PairingHeap( );
 
@@ -99,7 +99,7 @@ protected:
 	}
 private:
 	PairNode<T> *root;
-	bool (*lessThan)(T &lhs, T &rhs);
+	bool (*lessThan)(T const &lhs, T const &rhs);
 	int counter;
 	void reclaimMemory( PairNode<T> *t ) const;
 	void compareAndLink( PairNode<T> * & first, PairNode<T> *second ) const;