[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension/Rep FCO.cpp,1.14,1.15 FCO.h,1.11,1.12

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

Update of /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep
In directory braindrain:/tmp/cvs-serv23590/Rep

Modified Files:
	FCO.cpp FCO.h 
Log Message:
Debug message removed.


CVS User: zolmol

Index: FCO.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FCO.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** FCO.cpp	16 Jun 2004 18:35:02 -0000	1.14
--- FCO.cpp	30 Jun 2004 17:58:24 -0000	1.15
***************
*** 639,643 ****
  are inherited multiple times.
  Checks how many children of "it" (alleged multiple base) are in the set of ancestors of "this"
! If only one child of "it" is ancestor of "this" than there is no need for that child to be 
  inherited virtually from "it"
  If more than one children are ancestors of "this" then these classes must be virtually derived
--- 639,643 ----
  are inherited multiple times.
  Checks how many children of "it" (alleged multiple base) are in the set of ancestors of "this"
! If only one child of "it" is ancestor of "this" then there is no need for that child to be 
  inherited virtually from "it"
  If more than one children are ancestors of "this" then these classes must be virtually derived
***************
*** 672,676 ****
  		}
  		else
! 			global_vars.err << std::string( getName() + " has caugth one tricky multiple base: " + (*it)->getName() + "\n");
  	}
  	return true;
--- 672,680 ----
  		}
  		else
! 		{
! #ifdef _DEBUG
! 			global_vars.err << std::string( getName() + " has caught one tricky multiple base: " + (*it)->getName() + "\n");
! #endif
! 		}
  	}
  	return true;

Index: FCO.h
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FCO.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** FCO.h	16 Jun 2004 18:35:02 -0000	1.11
--- FCO.h	30 Jun 2004 17:58:24 -0000	1.12
***************
*** 221,228 ****
     \ / | \  /
      B1 F  B2
! 		|\   /
! 		|  D
       \ |
! 			 E
  
  D.m_multipleBaseClasses = A, X
--- 221,228 ----
     \ / | \  /
      B1 F  B2
!     |\   /
!     |  D
       \ |
!        E
  
  D.m_multipleBaseClasses = A, X