[cgma-dev] r5556 - cgm/trunk/geom/virtual

[jvporter at wisc.edu]

Author: jvporter
Date: 2012-06-07 18:00:08 -0500 (Thu, 07 Jun 2012)
New Revision: 5556

Modified:
   cgm/trunk/geom/virtual/CompositeCurve.cpp
   cgm/trunk/geom/virtual/CompositePoint.cpp
   cgm/trunk/geom/virtual/HiddenEntitySet.cpp
   cgm/trunk/geom/virtual/PST_Data.cpp
   cgm/trunk/geom/virtual/PartitionCurve.cpp
   cgm/trunk/geom/virtual/PartitionEntity.cpp
   cgm/trunk/geom/virtual/PartitionLumpImprint.cpp
   cgm/trunk/geom/virtual/PartitionPoint.cpp
   cgm/trunk/geom/virtual/PartitionSurface.cpp
   cgm/trunk/geom/virtual/SegmentedCurve.cpp
Log:
Fix some errors from previous commit


Modified: cgm/trunk/geom/virtual/CompositeCurve.cpp
===================================================================
--- cgm/trunk/geom/virtual/CompositeCurve.cpp	2012-06-07 22:50:25 UTC (rev 5555)
+++ cgm/trunk/geom/virtual/CompositeCurve.cpp	2012-06-07 23:00:08 UTC (rev 5556)
@@ -1075,7 +1075,7 @@
       PRINT_INFO(": %d curves.\n", num_curves() );
 #else
     PRINT_INFO("%sCompositeCurve %p : points (%p,%p) ", prefix,
-      static_cast<void*>(this), static_cast<void*>(startPoint),
+      static_cast<const void*>(this), static_cast<void*>(startPoint),
       static_cast<void*>(endPoint) );
     if ( num_curves() == 1 )
       PRINT_INFO(": %s %p\n", fix_type_name(typeid(*get_curve(0)).name()), 
@@ -1093,7 +1093,7 @@
 #ifdef TOPOLOGY_BRIDGE_IDS
   PRINT_INFO("%sCompositeCurve %d\n", prefix, get_id() );
 #else
-  PRINT_INFO("%sCompositeCurve %p\n", prefix, static_cast<void*>(this) );
+  PRINT_INFO("%sCompositeCurve %p\n", prefix, static_cast<const void*>(this) );
 #endif
   compGeom->print_debug_info( new_prefix );
   if( hiddenSet ) hiddenSet->print_debug_info( new_prefix );

Modified: cgm/trunk/geom/virtual/CompositePoint.cpp
===================================================================
--- cgm/trunk/geom/virtual/CompositePoint.cpp	2012-06-07 22:50:25 UTC (rev 5555)
+++ cgm/trunk/geom/virtual/CompositePoint.cpp	2012-06-07 23:00:08 UTC (rev 5556)
@@ -165,7 +165,8 @@
     realPoint ? fix_type_name(typeid(*realPoint).name()) : "NO REAL POINT", 
     realPoint ? realPoint->get_id() : 0 );
 #else  
-  PRINT_INFO("%sCompositePoint %p : %s %p\n", prefix, static_cast<void*>(this),
+  PRINT_INFO("%sCompositePoint %p : %s %p\n", prefix,
+    static_cast<const void*>(this),
     realPoint ? fix_type_name(typeid(*realPoint).name()) : "NO REAL POINT", 
     static_cast<void*>(realPoint));
 #endif

Modified: cgm/trunk/geom/virtual/HiddenEntitySet.cpp
===================================================================
--- cgm/trunk/geom/virtual/HiddenEntitySet.cpp	2012-06-07 22:50:25 UTC (rev 5555)
+++ cgm/trunk/geom/virtual/HiddenEntitySet.cpp	2012-06-07 23:00:08 UTC (rev 5556)
@@ -168,7 +168,7 @@
     prefix = "";
   
   PRINT_INFO("%sHiddenEntitySet %p owned by %s %p\n", 
-    prefix, static_cast<void*>(this),
+    prefix, static_cast<const void*>(this),
     myOwner ? fix_type_name(typeid(*myOwner).name()) : "(null)",
     static_cast<void*>(myOwner) );