Merge pull request #250 from starseeker/master

mpictor · mpictor · commit da3fe4543f86 · 2013-08-14T15:16:07.000-07:00
Merge local BRL-CAD changes
diff --git a/src/base/sc_memmgr.cc b/src/base/sc_memmgr.cc
@@ -4,12 +4,8 @@
 #include <sc_cf.h>
 #include "sc_memmgr.h"
 
-#if __APPLE__
-# include <malloc/malloc.h>
-#else
-# include <malloc.h>
-#endif
 #include <stdio.h>
+#include <stdlib.h>
 
 #include <string>
 #include <set>
diff --git a/src/cldai/sdaiDaObject.h b/src/cldai/sdaiDaObject.h
@@ -186,6 +186,7 @@ class SC_DAI_EXPORT SDAI_DAObject : public SDAI_sdaiObject {
         virtual ~SDAI_DAObject();
 
         Logical dado_same( SDAI_DAObject_ptr obj ) {
+            if (obj == this) return LTrue;
             return LUnknown;
         }
 
diff --git a/src/cldai/sdaiModel_contents.h b/src/cldai/sdaiModel_contents.h
@@ -41,7 +41,7 @@ class SC_DAI_EXPORT SDAI_Model_contents_instances : public SDAI_DAObject {
         }
         SDAI_DAObject__set_var contents_() const {
             return ( const SDAI_DAObject__set_var ) &_instances;
-        };
+        }
 
 };
 
diff --git a/src/cllazyfile/lazyInstMgr.cc b/src/cllazyfile/lazyInstMgr.cc
@@ -51,7 +51,7 @@ void lazyInstMgr::addLazyInstance( namedLazyInstance inst ) {
     */
     positionAndSection ps = inst.loc.section;
     ps <<= 48;
-    ps |= ( inst.loc.begin & 0xFFFFFFFFFFFF );
+    ps |= ( inst.loc.begin & 0xFFFFFFFFFFFFULL );
     _instanceStreamPos.insert( inst.loc.instance, ps );
 
     if( inst.refs ) {
@@ -104,7 +104,7 @@ SDAI_Application_instance * lazyInstMgr::loadInstance( instanceID id ) {
             case 1:
                 long int off;
                 ps = cv->at( 0 );
-                off = ps & 0xFFFFFFFFFFFF;
+                off = ps & 0xFFFFFFFFFFFFULL;
                 sid = ps >> 48;
                 assert( _dataSections.size() > sid );
                 inst = _dataSections[sid]->getRealInstance( _mainRegistry, off, id );
diff --git a/src/cllazyfile/p21HeaderSectionReader.cc b/src/cllazyfile/p21HeaderSectionReader.cc
@@ -54,11 +54,11 @@ const namedLazyInstance p21HeaderSectionReader::nextInstance() {
         assert( strlen( i.name ) > 0 );
 
         std::streampos end = seekInstanceEnd( 0 ); //no references in file header
-        if( ( end == -1 ) || ( end >= _sectionEnd ) ) {
+        if( ( (signed long int)end == -1 ) || ( end >= _sectionEnd ) ) {
             //invalid instance, so clear everything
             i.loc.begin = -1;
             i.name = 0;
         }
     }
     return i;
-}
+}
diff --git a/src/clstepcore/ExpDict.cc b/src/clstepcore/ExpDict.cc
@@ -28,7 +28,7 @@ Explicit_item_id__set::Explicit_item_id__set( int defaultSize ) {
 }
 
 Explicit_item_id__set::~Explicit_item_id__set() {
-    delete [] _buf;
+    delete[] _buf;
 }
 
 void Explicit_item_id__set::Check( int index ) {
@@ -38,7 +38,7 @@ void Explicit_item_id__set::Check( int index ) {
         _bufsize = ( index + 1 ) * 2;
         newbuf = new Explicit_item_id_ptr[_bufsize];
         memmove( newbuf, _buf, _count * sizeof( Explicit_item_id_ptr ) );
-        delete _buf;
+        delete[] _buf;
         _buf = newbuf;
     }
 }
@@ -117,7 +117,7 @@ Implicit_item_id__set::Implicit_item_id__set( int defaultSize ) {
 }
 
 Implicit_item_id__set::~Implicit_item_id__set() {
-    delete _buf;
+    delete[] _buf;
 }
 
 void Implicit_item_id__set::Check( int index ) {
@@ -127,7 +127,7 @@ void Implicit_item_id__set::Check( int index ) {
         _bufsize = ( index + 1 ) * 2;
         newbuf = new Implicit_item_id_ptr[_bufsize];
         memmove( newbuf, _buf, _count * sizeof( Implicit_item_id_ptr ) );
-        delete _buf;
+        delete[]_buf;
         _buf = newbuf;
     }
 }
@@ -206,7 +206,7 @@ Interface_spec__set::Interface_spec__set( int defaultSize ) {
 }
 
 Interface_spec__set::~Interface_spec__set() {
-    delete [] _buf;
+    delete[] _buf;
 }
 
 void Interface_spec__set::Check( int index ) {
@@ -216,7 +216,7 @@ void Interface_spec__set::Check( int index ) {
         _bufsize = ( index + 1 ) * 2;
         newbuf = new Interface_spec_ptr[_bufsize];
         memmove( newbuf, _buf, _count * sizeof( Interface_spec_ptr ) );
-        delete _buf;
+        delete[] _buf;
         _buf = newbuf;
     }
 }
@@ -1025,7 +1025,7 @@ Where_rule__list::Where_rule__list( int defaultSize ) {
 Where_rule__list::~Where_rule__list() {
     Clear();
 
-    delete _buf;
+    delete[] _buf;
 }
 
 void Where_rule__list::Check( int index ) {
@@ -1035,7 +1035,7 @@ void Where_rule__list::Check( int index ) {
         _bufsize = ( index + 1 ) * 2;
         newbuf = new Where_rule_ptr[_bufsize];
         memmove( newbuf, _buf, _count * sizeof( Where_rule_ptr ) );
-        delete _buf;
+        delete[] _buf;
         _buf = newbuf;
     }
 }
@@ -1134,7 +1134,7 @@ Uniqueness_rule__set::Uniqueness_rule__set( int defaultSize ) {
 Uniqueness_rule__set::~Uniqueness_rule__set() {
     Clear();
 
-    delete _buf;
+    delete[] _buf;
 }
 
 void Uniqueness_rule__set::Check( int index ) {
@@ -1144,7 +1144,7 @@ void Uniqueness_rule__set::Check( int index ) {
         _bufsize = ( index + 1 ) * 2;
         newbuf = new Uniqueness_rule_ptr[_bufsize];
         memmove( newbuf, _buf, _count * sizeof( Uniqueness_rule_ptr ) );
-        delete _buf;
+        delete[] _buf;
         _buf = newbuf;
     }
 }
@@ -1255,7 +1255,7 @@ Global_rule__set::Global_rule__set( int defaultSize ) {
 
 Global_rule__set::~Global_rule__set() {
     Clear();
-    delete _buf;
+    delete[] _buf;
 }
 
 void Global_rule__set::Check( int index ) {
@@ -1265,7 +1265,7 @@ void Global_rule__set::Check( int index ) {
         _bufsize = ( index + 1 ) * 2;
         newbuf = new Global_rule_ptr[_bufsize];
         memmove( newbuf, _buf, _count * sizeof( Global_rule_ptr ) );
-        delete [] _buf;
+        delete[] _buf;
         _buf = newbuf;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,7 @@ class SC_DAI_EXPORT SDAI_DAObject : public SDAI_sdaiObject {`
`186`	`186`	`virtual ~SDAI_DAObject();`
`187`	`187`
`188`	`188`	`Logical dado_same( SDAI_DAObject_ptr obj ) {`
	`189`	`+ if (obj == this) return LTrue;`
`189`	`190`	`return LUnknown;`
`190`	`191`	`}`
`191`	`192`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ class SC_DAI_EXPORT SDAI_Model_contents_instances : public SDAI_DAObject {`
`41`	`41`	`}`
`42`	`42`	`SDAI_DAObject__set_var contents_() const {`
`43`	`43`	`return ( const SDAI_DAObject__set_var ) &_instances;`
`44`		`- };`
	`44`	`+ }`
`45`	`45`
`46`	`46`	`};`
`47`	`47`
Original file line number	Diff line number	Diff line change
`@@ -54,11 +54,11 @@ const namedLazyInstance p21HeaderSectionReader::nextInstance() {`
`54`	`54`	`assert( strlen( i.name ) > 0 );`
`55`	`55`
`56`	`56`	`std::streampos end = seekInstanceEnd( 0 ); //no references in file header`
`57`		`- if( ( end == -1 ) \|\| ( end >= _sectionEnd ) ) {`
	`57`	`+ if( ( (signed long int)end == -1 ) \|\| ( end >= _sectionEnd ) ) {`
`58`	`58`	`//invalid instance, so clear everything`
`59`	`59`	`i.loc.begin = -1;`
`60`	`60`	`i.name = 0;`
`61`	`61`	`}`
`62`	`62`	`}`
`63`	`63`	`return i;`
`64`		`-}`
	`64`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ Explicit_item_id__set::Explicit_item_id__set( int defaultSize ) {`
`28`	`28`	`}`
`29`	`29`
`30`	`30`	`Explicit_item_id__set::~Explicit_item_id__set() {`
`31`		`- delete [] _buf;`
	`31`	`+ delete[] _buf;`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`void Explicit_item_id__set::Check( int index ) {`
`@@ -38,7 +38,7 @@ void Explicit_item_id__set::Check( int index ) {`
`38`	`38`	`_bufsize = ( index + 1 ) * 2;`
`39`	`39`	`newbuf = new Explicit_item_id_ptr[_bufsize];`
`40`	`40`	`memmove( newbuf, _buf, _count * sizeof( Explicit_item_id_ptr ) );`
`41`		`- delete _buf;`
	`41`	`+ delete[] _buf;`
`42`	`42`	`_buf = newbuf;`
`43`	`43`	`}`
`44`	`44`	`}`
`@@ -117,7 +117,7 @@ Implicit_item_id__set::Implicit_item_id__set( int defaultSize ) {`
`117`	`117`	`}`
`118`	`118`
`119`	`119`	`Implicit_item_id__set::~Implicit_item_id__set() {`
`120`		`- delete _buf;`
	`120`	`+ delete[] _buf;`
`121`	`121`	`}`
`122`	`122`
`123`	`123`	`void Implicit_item_id__set::Check( int index ) {`
`@@ -127,7 +127,7 @@ void Implicit_item_id__set::Check( int index ) {`
`127`	`127`	`_bufsize = ( index + 1 ) * 2;`
`128`	`128`	`newbuf = new Implicit_item_id_ptr[_bufsize];`
`129`	`129`	`memmove( newbuf, _buf, _count * sizeof( Implicit_item_id_ptr ) );`
`130`		`- delete _buf;`
	`130`	`+ delete[]_buf;`
`131`	`131`	`_buf = newbuf;`
`132`	`132`	`}`
`133`	`133`	`}`
`@@ -206,7 +206,7 @@ Interface_spec__set::Interface_spec__set( int defaultSize ) {`
`206`	`206`	`}`
`207`	`207`
`208`	`208`	`Interface_spec__set::~Interface_spec__set() {`
`209`		`- delete [] _buf;`
	`209`	`+ delete[] _buf;`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`void Interface_spec__set::Check( int index ) {`
`@@ -216,7 +216,7 @@ void Interface_spec__set::Check( int index ) {`
`216`	`216`	`_bufsize = ( index + 1 ) * 2;`
`217`	`217`	`newbuf = new Interface_spec_ptr[_bufsize];`
`218`	`218`	`memmove( newbuf, _buf, _count * sizeof( Interface_spec_ptr ) );`
`219`		`- delete _buf;`
	`219`	`+ delete[] _buf;`
`220`	`220`	`_buf = newbuf;`
`221`	`221`	`}`
`222`	`222`	`}`
`@@ -1025,7 +1025,7 @@ Where_rule__list::Where_rule__list( int defaultSize ) {`
`1025`	`1025`	`Where_rule__list::~Where_rule__list() {`
`1026`	`1026`	`Clear();`
`1027`	`1027`
`1028`		`- delete _buf;`
	`1028`	`+ delete[] _buf;`
`1029`	`1029`	`}`
`1030`	`1030`
`1031`	`1031`	`void Where_rule__list::Check( int index ) {`
`@@ -1035,7 +1035,7 @@ void Where_rule__list::Check( int index ) {`
`1035`	`1035`	`_bufsize = ( index + 1 ) * 2;`
`1036`	`1036`	`newbuf = new Where_rule_ptr[_bufsize];`
`1037`	`1037`	`memmove( newbuf, _buf, _count * sizeof( Where_rule_ptr ) );`
`1038`		`- delete _buf;`
	`1038`	`+ delete[] _buf;`
`1039`	`1039`	`_buf = newbuf;`
`1040`	`1040`	`}`
`1041`	`1041`	`}`
`@@ -1134,7 +1134,7 @@ Uniqueness_rule__set::Uniqueness_rule__set( int defaultSize ) {`
`1134`	`1134`	`Uniqueness_rule__set::~Uniqueness_rule__set() {`
`1135`	`1135`	`Clear();`
`1136`	`1136`
`1137`		`- delete _buf;`
	`1137`	`+ delete[] _buf;`
`1138`	`1138`	`}`
`1139`	`1139`
`1140`	`1140`	`void Uniqueness_rule__set::Check( int index ) {`
`@@ -1144,7 +1144,7 @@ void Uniqueness_rule__set::Check( int index ) {`
`1144`	`1144`	`_bufsize = ( index + 1 ) * 2;`
`1145`	`1145`	`newbuf = new Uniqueness_rule_ptr[_bufsize];`
`1146`	`1146`	`memmove( newbuf, _buf, _count * sizeof( Uniqueness_rule_ptr ) );`
`1147`		`- delete _buf;`
	`1147`	`+ delete[] _buf;`
`1148`	`1148`	`_buf = newbuf;`
`1149`	`1149`	`}`
`1150`	`1150`	`}`
`@@ -1255,7 +1255,7 @@ Global_rule__set::Global_rule__set( int defaultSize ) {`
`1255`	`1255`
`1256`	`1256`	`Global_rule__set::~Global_rule__set() {`
`1257`	`1257`	`Clear();`
`1258`		`- delete _buf;`
	`1258`	`+ delete[] _buf;`
`1259`	`1259`	`}`
`1260`	`1260`
`1261`	`1261`	`void Global_rule__set::Check( int index ) {`
`@@ -1265,7 +1265,7 @@ void Global_rule__set::Check( int index ) {`
`1265`	`1265`	`_bufsize = ( index + 1 ) * 2;`
`1266`	`1266`	`newbuf = new Global_rule_ptr[_bufsize];`
`1267`	`1267`	`memmove( newbuf, _buf, _count * sizeof( Global_rule_ptr ) );`
`1268`		`- delete [] _buf;`
	`1268`	`+ delete[] _buf;`
`1269`	`1269`	`_buf = newbuf;`
`1270`	`1270`	`}`
`1271`	`1271`	`}`