From: Robert L. <rle...@us...> - 2007-03-04 16:50:40
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv19940/impl/space/GEN_ccmtools_local_Space Modified Files: Alien_gen.cc Log Message: Index: Alien_gen.cc =================================================================== RCS file: /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space/Alien_gen.cc,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Alien_gen.cc 2 Mar 2007 14:44:43 -0000 1.1 --- Alien_gen.cc 4 Mar 2007 16:50:31 -0000 1.2 *************** *** 112,115 **** --- 112,116 ---- { delegator->connect("Ar3", f); + Ar3_receptacle = f; } else *************** *** 134,137 **** --- 135,139 ---- { ::Components::Object::SmartPtr o = delegator->disconnect("Ar3"); + Ar3_receptacle.forget(); ::World::Data::SmartPtr f(dynamic_cast< ::World::Data*>(o.ptr())); return f; *************** *** 157,172 **** throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! Object::SmartPtr o = delegator->get_single_connection("Ar3"); ! ::World::Data::SmartPtr f(dynamic_cast< ::World::Data*>(o.ptr())); ! return f; ! } ! else ! { ! if(!Ar3_receptacle) ! throw ::Components::NoConnection(); ! return Ar3_receptacle; ! } } --- 159,165 ---- throw ::Components::InvalidConnection(); } ! if(!Ar3_receptacle) ! throw ::Components::NoConnection(); ! return Ar3_receptacle; } *************** *** 179,188 **** throw ::Components::InvalidConnection(); } ! stringstream s; ! s << "CCM_Ar4:" << Ar4_receptacle_counter++; ! ::Components::Cookie ck(s.str()); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar4_receptacles.insert(make_pair(ck, ccmf)); ! return ck; } --- 172,191 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! ::Components::Cookie ck = delegator->connect("Ar4", f); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar4_receptacles.insert(make_pair(ck, ccmf)); ! return ck; ! } ! else ! { ! stringstream s; ! s << "CCM_Ar4:" << Ar4_receptacle_counter++; ! ::Components::Cookie ck(s.str()); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar4_receptacles.insert(make_pair(ck, ccmf)); ! return ck; ! } } *************** *** 195,207 **** throw ::Components::InvalidConnection(); } ! if(Ar4_receptacles.find(ck) != Ar4_receptacles.end()) { ! ::World::CCM_Data::SmartPtr f(Ar4_receptacles[ck]); Ar4_receptacles.erase(ck); return f; } else { ! throw ::Components::InvalidConnection(); } } --- 198,220 ---- throw ::Components::InvalidConnection(); } ! if(delegator) { ! ::Components::Object::SmartPtr o = delegator->disconnect("Ar4", ck); Ar4_receptacles.erase(ck); + ::World::Data::SmartPtr f(dynamic_cast< ::World::Data*>(o.ptr())); return f; } else { ! if(Ar4_receptacles.find(ck) != Ar4_receptacles.end()) ! { ! ::World::CCM_Data::SmartPtr f(Ar4_receptacles[ck]); ! Ar4_receptacles.erase(ck); ! return f; ! } ! else ! { ! throw ::Components::InvalidConnection(); ! } } } |