Use the more standard term "pop" rather than "flush" for removing the next item from the queue.

mdboom · mdboom · commit 17b26f5df15e · 2010-06-24T17:05:49.000Z
svn path=/trunk/matplotlib/; revision=8462
diff --git a/src/path_converters.h b/src/path_converters.h
@@ -88,7 +88,7 @@ class EmbeddedQueue
     }
 
     inline bool
-    queue_flush(unsigned *cmd, double *x, double *y)
+    queue_pop(unsigned *cmd, double *x, double *y)
     {
         if (queue_nonempty())
         {
@@ -159,7 +159,7 @@ class PathNanRemover : protected EmbeddedQueue<4>
         if (m_has_curves)
         {
             /* This is the slow method for when there might be curves. */
-            if (queue_flush(&code, x, y))
+            if (queue_pop(&code, x, y))
             {
                 return code;
             }
@@ -216,7 +216,7 @@ class PathNanRemover : protected EmbeddedQueue<4>
                 }
             }
 
-            if (queue_flush(&code, x, y))
+            if (queue_pop(&code, x, y))
             {
                 return code;
             }
@@ -567,7 +567,7 @@ class PathSimplifier : protected EmbeddedQueue<9>
            the queue before proceeding to the main loop below.
            -- Michael Droettboom */
 
-        if (queue_flush(&cmd, x, y))
+        if (queue_pop(&cmd, x, y))
         {
             return cmd;
         }
@@ -740,7 +740,7 @@ class PathSimplifier : protected EmbeddedQueue<9>
 
         /* Return the first item in the queue, if any, otherwise
            indicate that we're done. */
-        if (queue_flush(&cmd, x, y))
+        if (queue_pop(&cmd, x, y))
         {
             return cmd;
         }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class EmbeddedQueue`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`inline bool`
`91`		`- queue_flush(unsigned cmd, double x, double *y)`
	`91`	`+ queue_pop(unsigned cmd, double x, double *y)`
`92`	`92`	`{`
`93`	`93`	`if (queue_nonempty())`
`94`	`94`	`{`
`@@ -159,7 +159,7 @@ class PathNanRemover : protected EmbeddedQueue<4>`
`159`	`159`	`if (m_has_curves)`
`160`	`160`	`{`
`161`	`161`	`/* This is the slow method for when there might be curves. */`
`162`		`- if (queue_flush(&code, x, y))`
	`162`	`+ if (queue_pop(&code, x, y))`
`163`	`163`	`{`
`164`	`164`	`return code;`
`165`	`165`	`}`
`@@ -216,7 +216,7 @@ class PathNanRemover : protected EmbeddedQueue<4>`
`216`	`216`	`}`
`217`	`217`	`}`
`218`	`218`
`219`		`- if (queue_flush(&code, x, y))`
	`219`	`+ if (queue_pop(&code, x, y))`
`220`	`220`	`{`
`221`	`221`	`return code;`
`222`	`222`	`}`
`@@ -567,7 +567,7 @@ class PathSimplifier : protected EmbeddedQueue<9>`
`567`	`567`	`the queue before proceeding to the main loop below.`
`568`	`568`	`-- Michael Droettboom */`
`569`	`569`
`570`		`- if (queue_flush(&cmd, x, y))`
	`570`	`+ if (queue_pop(&cmd, x, y))`
`571`	`571`	`{`
`572`	`572`	`return cmd;`
`573`	`573`	`}`
`@@ -740,7 +740,7 @@ class PathSimplifier : protected EmbeddedQueue<9>`
`740`	`740`
`741`	`741`	`/* Return the first item in the queue, if any, otherwise`
`742`	`742`	`indicate that we're done. */`
`743`		`- if (queue_flush(&cmd, x, y))`
	`743`	`+ if (queue_pop(&cmd, x, y))`
`744`	`744`	`{`
`745`	`745`	`return cmd;`
`746`	`746`	`}`