Changeset 10757 for OpenSceneGraph/trunk/src/osgUtil/TriStrip_heap_array.h

Timestamp:

11/16/09 16:17:57 (4 years ago)

Author:

robert

Message:

Removed throw.

Files:

• OpenSceneGraph/trunk/src/osgUtil/TriStrip_heap_array.h (modified) (9 diffs)

OpenSceneGraph/trunk/src/osgUtil/TriStrip_heap_array.h

@@ -3 +3 @@
 //////////////////////////////////////////////////////////////////////
 //
-//  Copyright (C) 2002 Tanguy Fautré.
+//  Copyright (C) 2002 Tanguy Fautrￜ.
 //
 //  This software is provided 'as-is', without any express or implied
@@ -21 +21 @@
 //  3. This notice may not be removed or altered from any source distribution.
 //
-//  Tanguy Fautré
+//  Tanguy Fautrￜ
 //  softdev@pandora.be
 //
@@ -45 +45 @@
 #define TRISTRIP_HEAP_ARRAY_H
 
-
 // namespace common_structures
 namespace common_structures {
@@ -149 +148 @@
 inline const T & heap_array<T, CmpT>::top() const {
     // Debug check to ensure heap is not empty
-    //assert(! empty());
-    if (empty()) throw "heap_array<T, CmpT>::top() error, heap empty";
+    if (empty())
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::top() error, heap empty."<<std::endl;
+    }
 
     return m_Heap.front().m_Elem;
@@ -160 +161 @@
     // Debug check to ensure element is still present
     //assert(! removed(i));
-    if (removed(i)) throw "heap_array<T, CmpT>::peek(size_t i) error";
+    if (removed(i))
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::peek(size_t i) error."<<std::endl;
+    }
 
     return (m_Heap[m_Finder[i]].m_Elem);
@@ -177 +181 @@
 
     // Debug check to ensure heap is not empty
-    //assert(! empty());
-    if (empty()) throw "heap_array<T, CmpT>::pop() error, heap empty";
+    if (empty()) 
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::pop() error, heap empty."<<std::endl;;
+        return;
+    }
     
     Swap(0, size() - 1);
@@ -189 +196 @@
 inline size_t heap_array<T, CmpT>::push(const T & Elem) {
     if (m_Locked)
-        throw "heap_is_locked";
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::push() heap_is_locked."<<std::endl;;
+        return 0;
+    }
 
     size_t Id = size();
@@ -205 +215 @@
 
     // Debug check to ensure element is still present
-    if (removed(i)) throw "heap_array<T, CmpT>::erase(size_t i) error";
-
+    if (removed(i))
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::erase(size_t i) error."<<std::endl;;
+        return;
+    }
+    
     size_t j = m_Finder[i];
 
@@ -240 +254 @@
     // Debug check to ensure element is still present
     // assert(! removed(i));
-    if (removed(i)) throw "heap_array<T, CmpT>::update(size_t i, const T & Elem) error";
+    if (removed(i))
+    {
+        osg::notify(osg::NOTICE)<<"TriStripVisitor:: heap_array<T, CmpT>::update(size_t i, const T & Elem) error."<<std::endl;;
+        return;
+    }
 
     size_t j = m_Finder[i];