Changeset 13101 for issm/branches/trunk-jpl-damage/src/c/classes/Hook.cpp

Timestamp:

08/20/12 17:39:30 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl through revision 13099 into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• src/c/classes/Hook.cpp (modified) (3 diffs)

issm/branches/trunk-jpl-damage

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4

issm/branches/trunk-jpl-damage/src/c/classes/Hook.cpp

@@ -185 +185 @@
                         this->objects[i]=(Object*)dataset->GetObjectById(this->offsets+i,this->ids[i]); //remember the offset for later on.
                         /*check the id is correct!: */
-                        if (this->objects[i]->Id()!=this->ids[i]) _error2_("wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << "  in resolved pointer!");
+                        if (this->objects[i]->Id()!=this->ids[i]) _error_("wrong id: " << this->objects[i]->Id() << " vs " << this->ids[i] << "  in resolved pointer!");
                 }
         }
@@ -194 +194 @@
         
         /*first, check that we only have one T object in our object list: */
-        if (this->num!=1) _error2_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n");
+        if (this->num!=1) _error_("trying to delivery a single hook object when hook holds " << this->num << " objects" << "\n");
 
         /*check NULL: */
-        if (this->objects==NULL) _error2_("hook is not pointing to any object, objects pointer is NULL");
+        if (this->objects==NULL) _error_("hook is not pointing to any object, objects pointer is NULL");
 
         return *objects;
@@ -246 +246 @@
 
         /*Else, check that we are requesting a half of num*/
-        if (numindices>this->num) _error2_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects");
+        if (numindices>this->num) _error_("Cannot spawn hook with " << numindices << " objects from a Hook of " << this->num << " objects");
 
         /*go pickup the correct objects, ids and offsets :*/
         output->num=numindices;
-        if(output->num<1) _error2_("Trying to spawn an empty ElementProperties!");
+        if(output->num<1) _error_("Trying to spawn an empty ElementProperties!");
 
         output->objects=xNew<Object*>(output->num);

@@ +1 @@
+projects
 autom4te.cache
 aclocal.m4