Changeset 31442 for branches/eam_branches/ipp-20110404/ppStack/src/ppStackCombineInitial.c

Timestamp:

May 5, 2011, 10:09:53 AM (15 years ago)

Author:

eugene

Message:

merging updates from trunk

File:

• branches/eam_branches/ipp-20110404/ppStack/src/ppStackCombineInitial.c (modified) (2 diffs)

branches/eam_branches/ipp-20110404/ppStack/src/ppStackCombineInitial.c

@@ -1 +1 @@
 #include "ppStack.h"
 
-//#define TESTING                         // Enable test output
+// This is the doomsday switch.
+// #define TESTING                         // Enable test output
 
 bool ppStackCombineInitial(ppStackThreadData *stack, ppStackOptions *options, pmConfig *config)
@@ -9 +10 @@
     psAssert(config, "Require configuration");
 
-    if (!options->convolve) {
-        // No need to do initial combination when we haven't convolved
-        // XXX either allocate inspect and rejected here, or do not require them downstream
-        return true;
-    }
+/*     if (!options->convolve) { */
+/*         // No need to do initial combination when we haven't convolved */
+/*         // XXX either allocate inspect and rejected here, or do not require them downstream */
+/*         return true; */
+/*     } */
 
     psTimerStart("PPSTACK_INITIAL");