[GME-commit] GMESRC/Paradigms/MetaGME/BonExtension/Rep AttributeRep.cpp,1.6,1.7 FCO.cpp,1.9,1.10 ModelRep.cpp,1.8,1.9 SetRep.cpp,1.6,1.7

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

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

Modified Files:
	AttributeRep.cpp FCO.cpp ModelRep.cpp SetRep.cpp 
Log Message:
Library subfolders issue solved, and TO msgs removed.


CVS User: zolmol

Index: AttributeRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/AttributeRep.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** AttributeRep.cpp	10 Mar 2004 17:42:16 -0000	1.6
--- AttributeRep.cpp	11 Mar 2004 15:53:21 -0000	1.7
***************
*** 137,142 ****
  					m_items.push_back("Error");
  
- 				//TO( std::string("K") + items.substr( start_i, comma_i - start_i) +  std::string("V"));
- 				//TO( std::string("K") + items.substr( comma_i + 1, i - comma_i - 1)+  std::string("V"));
  				comma_i = 0;
  			}
--- 137,140 ----
***************
*** 155,160 ****
  					m_itemsVal.push_back(items.substr( st, end - st + 1));//m_itemsVal.push_back(items.substr( start_i, i - start_i));
  				}
- 				//TO( std::string("K") + items.substr( start_i, i - start_i) + std::string("V"));
- 				//TO( std::string("K") + items.substr( start_i, i - start_i) + std::string("V"));
  			}
  			++m_noOfItems; 
--- 153,156 ----

Index: FCO.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/FCO.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** FCO.cpp	10 Mar 2004 20:03:32 -0000	1.9
--- FCO.cpp	11 Mar 2004 15:53:21 -0000	1.10
***************
*** 551,555 ****
  		}
  		else
! 			TO( getName() + " has caugth one tricky multiple base: " + (*it)->getName());
  	}
  	return true;
--- 551,555 ----
  		}
  		else
! 			global_vars.err << std::string( getName() + " has caugth one tricky multiple base: " + (*it)->getName() + "\n");
  	}
  	return true;
***************
*** 571,576 ****
  
  	if ( !names1.empty() || !names2.empty())
! 		TO( getName() + " VirtualBase Classes\n" + names1 + 
! 		"\n" + getName() + " Multipl Base Classes\n" + names2);
  }
  
--- 571,575 ----
  
  	if ( !names1.empty() || !names2.empty())
! 		global_vars.err << std::string( getName() + " VirtualBase Classes\n" + names1 + "\n" + getName() + " Multipl Base Classes\n" + names2 + "\n");
  }
  

Index: ModelRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/ModelRep.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** ModelRep.cpp	10 Mar 2004 02:50:18 -0000	1.8
--- ModelRep.cpp	11 Mar 2004 15:53:21 -0000	1.9
***************
*** 224,230 ****
  	{
  		if ( (*model_it)->getMyKind() != Any::MODEL)
! 			TO("ERROR");
  		ModelRep * mod_desc_ptr = static_cast<ModelRep*>(*model_it);
! 		if (!mod_desc_ptr) TO(" NULL PTR ERROR");
  		m_name = mod_desc_ptr->getName();
  					
--- 224,230 ----
  	{
  		if ( (*model_it)->getMyKind() != Any::MODEL)
! 			global_vars.err << std::string("ERROR: model inherit\n");
  		ModelRep * mod_desc_ptr = static_cast<ModelRep*>(*model_it);
! 		if (!mod_desc_ptr) global_vars.err << std::string("NULL PTR ERROR: model inherit\n");
  		m_name = mod_desc_ptr->getName();
  					

Index: SetRep.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/Paradigms/MetaGME/BonExtension/Rep/SetRep.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** SetRep.cpp	10 Mar 2004 16:42:33 -0000	1.6
--- SetRep.cpp	11 Mar 2004 15:53:21 -0000	1.7
***************
*** 129,133 ****
  			if ( !member_ptr->checkIsPartOfFinal() && !member_ptr->isAbstract())
  			{
! 				TO("CHECK: set member " + member_ptr->getName() + " [in set " + getName() + "] has no parent.\n");
  				res = false;
  			}
--- 129,133 ----
  			if ( !member_ptr->checkIsPartOfFinal() && !member_ptr->isAbstract())
  			{
! 				global_vars.err << std::string("CHECK: set member " + member_ptr->getName() + " [in set " + getName() + "] has no parent.\n");
  				res = false;
  			}