|
From: Robert L. <rle...@us...> - 2007-03-05 07:35:40
|
Update of /cvsroot/ccmtools/ccmtools/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv22998/test/CppAssembly/prototype1/impl/space/GEN_ccmtools_local_Space Modified Files: Alien_gen.cc Log Message: new prototype 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.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** Alien_gen.cc 4 Mar 2007 16:50:31 -0000 1.2 --- Alien_gen.cc 5 Mar 2007 07:35:36 -0000 1.3 *************** *** 238,246 **** throw ::Components::InvalidConnection(); } ! if(Ar10_receptacle) ! { ! throw ::Components::AlreadyConnected(); ! } ! Ar10_receptacle = f; } --- 238,254 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! delegator->connect("Ar10", f); ! Ar10_receptacle = f; ! } ! else ! { ! if(Ar10_receptacle) ! { ! throw ::Components::AlreadyConnected(); ! } ! Ar10_receptacle = f; ! } } *************** *** 253,264 **** throw ::Components::InvalidConnection(); } ! if(!Ar10_receptacle) ! { ! throw ::Components::NoConnection(); ! } ! // local_component->disconnect("Ar10"); ! ::World::Data::SmartPtr f = Ar10_receptacle; ! Ar10_receptacle.forget(); ! return f; } --- 261,281 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! ::Components::Object::SmartPtr o = delegator->disconnect("Ar10"); ! Ar10_receptacle.forget(); ! ::World::Data::SmartPtr f(dynamic_cast< ::World::Data*>(o.ptr())); ! return f; ! } ! else ! { ! if(!Ar10_receptacle) ! { ! throw ::Components::NoConnection(); ! } ! ::World::Data::SmartPtr f = Ar10_receptacle; ! Ar10_receptacle.forget(); ! return f; ! } } *************** *** 284,292 **** throw ::Components::InvalidConnection(); } ! if(Ar6a_receptacle) ! { ! throw ::Components::AlreadyConnected(); ! } ! Ar6a_receptacle = f; } --- 301,317 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! delegator->connect("Ar6a", f); ! Ar6a_receptacle = f; ! } ! else ! { ! if(Ar6a_receptacle) ! { ! throw ::Components::AlreadyConnected(); ! } ! Ar6a_receptacle = f; ! } } *************** *** 299,310 **** throw ::Components::InvalidConnection(); } ! if(!Ar6a_receptacle) ! { ! throw ::Components::NoConnection(); ! } ! // local_component->disconnect("Ar6a"); ! ::World::Data::SmartPtr f = Ar6a_receptacle; ! Ar6a_receptacle.forget(); ! return f; } --- 324,344 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! ::Components::Object::SmartPtr o = delegator->disconnect("Ar6a"); ! Ar6a_receptacle.forget(); ! ::World::Data::SmartPtr f(dynamic_cast< ::World::Data*>(o.ptr())); ! return f; ! } ! else ! { ! if(!Ar6a_receptacle) ! { ! throw ::Components::NoConnection(); ! } ! ::World::Data::SmartPtr f = Ar6a_receptacle; ! Ar6a_receptacle.forget(); ! return f; ! } } *************** *** 330,338 **** throw ::Components::InvalidConnection(); } ! if(Ar6b_receptacle) ! { ! throw ::Components::AlreadyConnected(); ! } ! Ar6b_receptacle = f; } --- 364,380 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! delegator->connect("Ar6b", f); ! Ar6b_receptacle = f; ! } ! else ! { ! if(Ar6b_receptacle) ! { ! throw ::Components::AlreadyConnected(); ! } ! Ar6b_receptacle = f; ! } } *************** *** 345,356 **** throw ::Components::InvalidConnection(); } ! if(!Ar6b_receptacle) ! { ! throw ::Components::NoConnection(); ! } ! // local_component->disconnect("Ar6b"); ! ::World::Data::SmartPtr f = Ar6b_receptacle; ! Ar6b_receptacle.forget(); ! return f; } --- 387,407 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! ::Components::Object::SmartPtr o = delegator->disconnect("Ar6b"); ! Ar6b_receptacle.forget(); ! ::World::Data::SmartPtr f(dynamic_cast< ::World::Data*>(o.ptr())); ! return f; ! } ! else ! { ! if(!Ar6b_receptacle) ! { ! throw ::Components::NoConnection(); ! } ! ::World::Data::SmartPtr f = Ar6b_receptacle; ! Ar6b_receptacle.forget(); ! return f; ! } } *************** *** 376,385 **** throw ::Components::InvalidConnection(); } ! stringstream s; ! s << "CCM_Ar7a:" << Ar7a_receptacle_counter++; ! ::Components::Cookie ck(s.str()); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar7a_receptacles.insert(make_pair(ck, ccmf)); ! return ck; } --- 427,446 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! ::Components::Cookie ck = delegator->connect("Ar7a", f); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar7a_receptacles.insert(make_pair(ck, ccmf)); ! return ck; ! } ! else ! { ! stringstream s; ! s << "CCM_Ar7a:" << Ar7a_receptacle_counter++; ! ::Components::Cookie ck(s.str()); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar7a_receptacles.insert(make_pair(ck, ccmf)); ! return ck; ! } } *************** *** 392,404 **** throw ::Components::InvalidConnection(); } ! if(Ar7a_receptacles.find(ck) != Ar7a_receptacles.end()) { ! ::World::CCM_Data::SmartPtr f(Ar7a_receptacles[ck]); Ar7a_receptacles.erase(ck); return f; } else { ! throw ::Components::InvalidConnection(); } } --- 453,475 ---- throw ::Components::InvalidConnection(); } ! if(delegator) { ! ::Components::Object::SmartPtr o = delegator->disconnect("Ar7a", ck); Ar7a_receptacles.erase(ck); + ::World::Data::SmartPtr f(dynamic_cast< ::World::Data*>(o.ptr())); return f; } else { ! if(Ar7a_receptacles.find(ck) != Ar7a_receptacles.end()) ! { ! ::World::CCM_Data::SmartPtr f(Ar7a_receptacles[ck]); ! Ar7a_receptacles.erase(ck); ! return f; ! } ! else ! { ! throw ::Components::InvalidConnection(); ! } } } *************** *** 422,431 **** throw ::Components::InvalidConnection(); } ! stringstream s; ! s << "CCM_Ar7b:" << Ar7b_receptacle_counter++; ! ::Components::Cookie ck(s.str()); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar7b_receptacles.insert(make_pair(ck, ccmf)); ! return ck; } --- 493,512 ---- throw ::Components::InvalidConnection(); } ! if(delegator) ! { ! ::Components::Cookie ck = delegator->connect("Ar7b", f); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar7b_receptacles.insert(make_pair(ck, ccmf)); ! return ck; ! } ! else ! { ! stringstream s; ! s << "CCM_Ar7b:" << Ar7b_receptacle_counter++; ! ::Components::Cookie ck(s.str()); ! ::World::CCM_Data::SmartPtr ccmf(dynamic_cast< ::World::CCM_Data* >(f.ptr())); ! Ar7b_receptacles.insert(make_pair(ck, ccmf)); ! return ck; ! } } *************** *** 438,450 **** throw ::Components::InvalidConnection(); } ! if(Ar7b_receptacles.find(ck) != Ar7b_receptacles.end()) { ! ::World::CCM_Data::SmartPtr f(Ar7b_receptacles[ck]); Ar7b_receptacles.erase(ck); return f; } else { ! throw ::Components::InvalidConnection(); } } --- 519,541 ---- throw ::Components::InvalidConnection(); } ! if(delegator) { ! ::Components::Object::SmartPtr o = delegator->disconnect("Ar7b", ck); Ar7b_receptacles.erase(ck); + ::World::Data::SmartPtr f(dynamic_cast< ::World::Data*>(o.ptr())); return f; } else { ! if(Ar7b_receptacles.find(ck) != Ar7b_receptacles.end()) ! { ! ::World::CCM_Data::SmartPtr f(Ar7b_receptacles[ck]); ! Ar7b_receptacles.erase(ck); ! return f; ! } ! else ! { ! throw ::Components::InvalidConnection(); ! } } } |