Changeset 1140 for trunk/source/graphics_reps/src/HepPolyhedron.cc

Timestamp:

Nov 3, 2009, 11:17:28 AM (15 years ago)

Author:

garnier

Message:

update to CVS

File:

• trunk/source/graphics_reps/src/HepPolyhedron.cc (modified) (5 diffs)

trunk/source/graphics_reps/src/HepPolyhedron.cc

@@ -25 +25 @@
 //
 //
-// $Id: HepPolyhedron.cc,v 1.32 2008/11/13 09:05:27 gcosmo Exp $
-// GEANT4 tag $Name: geant4-09-02-ref-02 $
+// $Id: HepPolyhedron.cc,v 1.34 2009/10/28 13:36:32 allison Exp $
+// GEANT4 tag $Name:  $
 //
 // 
@@ -2255 +2255 @@
 
 #include "BooleanProcessor.src"
-static BooleanProcessor processor;
 
 HepPolyhedron HepPolyhedron::add(const HepPolyhedron & p) const 
@@ -2267 +2266 @@
  ***********************************************************************/
 {
-  return processor.execute(OP_UNION, *this, p);
+  int ierr;
+  BooleanProcessor processor;
+  return processor.execute(OP_UNION, *this, p,ierr);
 }
 
@@ -2280 +2281 @@
  ***********************************************************************/
 {
-  return processor.execute(OP_INTERSECTION, *this, p);
+  int ierr;
+  BooleanProcessor processor;
+  return processor.execute(OP_INTERSECTION, *this, p,ierr);
 }
 
@@ -2293 +2296 @@
  ***********************************************************************/
 {
-  return processor.execute(OP_SUBTRACTION, *this, p);
-}
-
-bool HepPolyhedron::IsErrorBooleanProcess() const {
-  return processor.get_processor_error();
-}
+  int ierr;
+  BooleanProcessor processor;
+  return processor.execute(OP_SUBTRACTION, *this, p,ierr);
+}
+
+//NOTE : include the code of HepPolyhedronProcessor here
+//       since there is no BooleanProcessor.h
+
+#undef INTERSECTION
+
+#include "HepPolyhedronProcessor.src"
+