Text archives Help

---

Author: abe
Date: Tue Jan 24 18:32:00 2006
New Revision: 864

Modified:
   trunk/Model/Groups/TransparentKDTree.h
   trunk/Model/Groups/VerticalKDTree.cc
Log:

Fixed code which prevented build with gcc4

M    Model/Groups/TransparentKDTree.h
M    Model/Groups/VerticalKDTree.cc


Modified: trunk/Model/Groups/TransparentKDTree.h
==============================================================================
--- trunk/Model/Groups/TransparentKDTree.h      (original)
+++ trunk/Model/Groups/TransparentKDTree.h      Tue Jan 24 18:32:00 2006
@@ -93,11 +93,12 @@
       void setPickedFlag(unsigned char flag) { pickedFlag = flag; }
       unsigned char getPickedFlag() { return pickedFlag; }
 
+      // Predeclaration for the benefit of functions that want to use it.
+                       class ScratchPadInfo;
+      
     private:           
       Real sample_alpha;
 
-      // Predeclaration for the benefit of functions that want to use it.
-                       class ScratchPadInfo;
 
       // This method intersects a list of triangles with the ray.
       int intersectTrianglesTransparent(const Pointf& origin,

Modified: trunk/Model/Groups/VerticalKDTree.cc
==============================================================================
--- trunk/Model/Groups/VerticalKDTree.cc        (original)
+++ trunk/Model/Groups/VerticalKDTree.cc        Tue Jan 24 18:32:00 2006
@@ -254,8 +254,14 @@
 
 // Traversal Stack Entry.
 struct Stack {
-  __declspec(align(16)) float t_near[TraversalPacketSize];
-  __declspec(align(16)) float t_far [TraversalPacketSize];
+#if __ECC
+  __declspec(align(16))
+#endif
+    float t_near[TraversalPacketSize];
+#if __ECC
+  __declspec(align(16)) 
+#endif
+    float t_far [TraversalPacketSize];
   KDTreeNode* node;
 };
 

---

• [MANTA] r864 - trunk/Model/Groups, abe, 01/24/2006

---

Archive powered by MHonArc 2.6.16.