Mercurial > hg > octave-nkf

changeset 6677:9a8861bc2b34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-05-31 19:39:12 by jwe]
author jwe
date Thu, 31 May 2007 19:41:11 +0000
parents 43fdc8e8ed28
children 49724abe1236
files src/ChangeLog src/DLD-FUNCTIONS/symrcm.cc src/sysdep.cc
diffstat 3 files changed, 22 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-31  Michael Goffioul  <michael.goffioul@swing.be>
+
+	* DLD-FUNCTIONS/symrcm.cc: Use ! instead of "not".
+
+	* sysdep.cc (same_file_internal) [OCTAVE_USE_WINDOWS_API]:
+	Use INVALID_HANDLE_VALUE, not INVALID_FILE_HANDLE.
+
 2007-05-28  G. D. McBain  <geordie_mcbain@yahoo.com.au>
 
 	* ov-list.cc (append): Doc fix.
@@ -605,7 +612,7 @@
         (octregexprep): New function with functionality of old Fregexprep.
         (Fregexprep): Treat cell arguments.
 
-2007-02-26  From Michael Goffioul  <michael.goffioul@swing.be>
+2007-02-26  Michael Goffioul  <michael.goffioul@swing.be>
 
 	* Makefile.in: Use $(LN_S) instead of ln or ln -s.
 
--- a/src/DLD-FUNCTIONS/symrcm.cc
+++ b/src/DLD-FUNCTIONS/symrcm.cc
@@ -280,7 +280,7 @@
     {
       // locate an unvisited starting node of the graph
       for (i = 0; i < N; i++)
-	if (not visit[i]) 
+	if (! visit[i]) 
 	  break;
 
       // locate a probably better starting node
@@ -303,7 +303,7 @@
       // the root is the first/only node on level 0
       level_N = 1;
 	
-      while (not Q_empty (Q, N, qh, qt))
+      while (! Q_empty (Q, N, qh, qt))
 	{
 	  v = Q_deq (Q, N, qh, qt);
 	  i = v.id;
@@ -330,7 +330,7 @@
 	      if (j1 == cidx[i+1])
 		{
 		  octave_idx_type r2 = ridx2[j2++];
-		  if (not visit[r2])
+		  if (! visit[r2])
 		    {
 		      // the distance of node j is dist(i)+1
 		      w.id = r2;
@@ -343,7 +343,7 @@
 	      else if (j2 == cidx2[i+1])
 		{
 		  octave_idx_type r1 = ridx[j1++];
-		  if (not visit[r1])
+		  if (! visit[r1])
 		    {
 		      w.id = r1;
 		      w.deg = D[r1];
@@ -358,7 +358,7 @@
 		  octave_idx_type r2 = ridx2[j2];
 		  if (r1 <= r2)
 		    {
-		      if (not visit[r1])
+		      if (! visit[r1])
 			{
 			  w.id = r1;
 			  w.deg = D[r1];
@@ -372,7 +372,7 @@
 		    }
 		  else
 		    {
-		      if (not visit[r2])
+		      if (! visit[r2])
 			{
 			  w.id = r2;
 			  w.deg = D[r2];
@@ -386,7 +386,7 @@
 	    }
 
 	  // add the neighbors to the queue (sorted by node degree)
-	  while (not H_empty(S, s))
+	  while (! H_empty(S, s))
 	    {
 	      OCTAVE_QUIT;
 
@@ -564,7 +564,7 @@
 
   for (;;)
     {
-      while (not Q_empty(Q, N, qh, qt))
+      while (! Q_empty(Q, N, qh, qt))
 	{
 	  v = Q_deq(Q, N, qh, qt);
 
@@ -583,7 +583,7 @@
 	      if (j1 == cidx[i+1])
 		{
 		  octave_idx_type r2 = ridx2[j2++];
-		  if (not visit[r2])
+		  if (! visit[r2])
 		    {
 		      // the distance of node j is dist(i)+1
 		      w.id = r2;
@@ -599,7 +599,7 @@
 	      else if (j2 == cidx2[i+1])
 		{
 		  octave_idx_type r1 = ridx[j1++];
-		  if (not visit[r1])
+		  if (! visit[r1])
 		    {
 		      // the distance of node j is dist(i)+1
 		      w.id = r1;
@@ -618,7 +618,7 @@
 		  octave_idx_type r2 = ridx2[j2];
 		  if (r1 <= r2)
 		    {
-		      if (not visit[r1])
+		      if (! visit[r1])
 			{
 			  w.id = r1;
 			  w.deg = D[r1];
@@ -635,7 +635,7 @@
 		    }
 		  else
 		    {
-		      if (not visit[r2])
+		      if (! visit[r2])
 			{
 			  w.id = r2;
 			  w.deg = D[r2];
--- a/src/sysdep.cc
+++ b/src/sysdep.cc
@@ -244,13 +244,13 @@
   hfile1 = CreateFile (file1.c_str (), 0, FILE_SHARE_READ, 0,
 		       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0); 
 
-  if (hfile1 == INVALID_FILE_HANDLE)
+  if (hfile1 == INVALID_HANDLE_VALUE)
     return false;
   
   hfile2 = CreateFile (file2.c_str (), 0, FILE_SHARE_READ, 0,
 		       OPEN_EXISTING, FILE_ATTRIBUTE_NORMAL, 0);
 
-  if (hfile2 == INVALID_FILE_HANDLE)
+  if (hfile2 == INVALID_HANDLE_VALUE)
     {
       CloseHandle (hfile1);
       return false;