[GME-commit] GMESRC/SDK/BON Extensions.cpp,1.7,1.8

[gme-commit at list.isis.vanderbilt.edu]

Update of /var/lib/gme/GMESRC/SDK/BON
In directory braindrain:/tmp/cvs-serv24224

Modified Files:
	Extensions.cpp 
Log Message:
Infinite recursion problem with multiple abstract base classes fixed.


CVS User: volgy

Index: Extensions.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/SDK/BON/Extensions.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Extensions.cpp	3 Feb 2004 10:53:05 -0000	1.7
--- Extensions.cpp	4 May 2004 13:58:19 -0000	1.8
***************
*** 121,124 ****
--- 121,129 ----
  
  		if ( eType2 == OT_Null ) {
+ 			if (eType1 == OT_Null) {
+ 				strType = strType2;
+ 				eType = OT_Null;
+ 				return;
+ 			}
  			mergeTypes( strType2, eType2, strType1, eType1, strType, eType );
  			return;