Commit 09e50c5c authored by Nicolas Philipps's avatar Nicolas Philipps
Browse files

Fixed clang/icc compilation

--HG--
branch : fw4spl_0.8.3
extra : source : 9683c5f861cd3cec20b0e2b36c37a8ee88ac2825
parent f32597e6
......@@ -254,7 +254,8 @@ void SwapperSrv::addObject( const std::string objectId, ::fwTools::Object::sptr
OSLM_ASSERT("ObjectType "<<objectType<<" does not match ObjectType in Composite "<<object->getClassname(),
objectType == object->getClassname());
SubServicesVecType subVecSrv;
BOOST_FOREACH( ConfigurationType cfg, conf->find("service"))
std::vector< ConfigurationType > confVec = conf->find("service");
BOOST_FOREACH( ConfigurationType cfg, confVec )
{
::fwServices::IService::sptr srv = this->add( object, cfg );
OSLM_ASSERT("Instantiation Service failed on object "<<objectId, srv);
......@@ -299,7 +300,8 @@ void SwapperSrv::swapObject(const std::string objectId, ::fwTools::Object::sptr
{
if(m_objectsSubServices.find(objectId) != m_objectsSubServices.end())
{
BOOST_FOREACH( ConfigurationType cfg, m_managerConfiguration->find("object", "id", objectId))
std::vector< ConfigurationType > confVec = m_managerConfiguration->find("object", "id", objectId);
BOOST_FOREACH( ConfigurationType cfg, confVec )
{
SubServicesVecType subServices = m_objectsSubServices[objectId];
BOOST_FOREACH( SPTR(SubService) subSrv, subServices )
......@@ -404,7 +406,8 @@ void SwapperSrv::initOnDummyObject( std::string objectId )
::fwTools::Object::sptr dummyObj = ::fwTools::Factory::New(objectType);
SubServicesVecType subVecSrv;
BOOST_FOREACH( ConfigurationType cfg, conf->find("service"))
std::vector < ConfigurationType > confVec = conf->find("service");
BOOST_FOREACH( ConfigurationType cfg, confVec )
{
::fwServices::IService::sptr srv = this->add( dummyObj, cfg );
OSLM_ASSERT("Instantiation Service failed on object "<<objectId, srv);
......
......@@ -13,6 +13,7 @@
#include <fwData/Composite.hpp>
#include <fwData/String.hpp>
#include <fwData/Composite.hpp>
#include "fwServices/registry/AppConfig.hpp"
......
......@@ -127,7 +127,7 @@ public:
const ConcreteFactory &concreteFactory = dynamic_cast< const ConcreteFactory &>(other);
const Key &otherKey = concreteFactory.keyValue();
#ifdef CLASSFACTORYORDERDEBUG
SLM_TRACE("keyLower" << isMyKeyLower(otherKey) );
SLM_TRACE("keyLower" << this->isMyKeyLower(otherKey) );
#endif
return this->isMyKeyLower(otherKey);
}
......
......@@ -114,9 +114,10 @@ template< class CLASS >
typename DynamicAttributes< CLASS >::AttrNameVectorType DynamicAttributes< CLASS >::getAttributeNames()
{
AttrNameVectorType names;
BOOST_FOREACH( typename DynamicAttributes::AttrMapType::value_type p , this->__FWTOOLS_ATTRIBUTE_MAP_NAME)
typename DynamicAttributes::AttrMapType::const_iterator iter;
for ( iter = this->__FWTOOLS_ATTRIBUTE_MAP_NAME.begin(); iter != this->__FWTOOLS_ATTRIBUTE_MAP_NAME.end(); ++iter )
{
names.push_back(p.first);
names.push_back((*iter).first);
}
return names;
}
......
......@@ -410,9 +410,8 @@ void VtkRenderService::updating( ::fwServices::ObjectMsg::csptr message ) throw(
BOOST_FOREACH( std::string objectId, objectIds)
{
BOOST_FOREACH(
ConfigurationType cfg,
m_sceneConfiguration->find("adaptor","objectId",objectId))
std::vector< ConfigurationType > confVec = m_sceneConfiguration->find("adaptor","objectId",objectId);
BOOST_FOREACH( ConfigurationType cfg, confVec )
{
this->configureObject(cfg);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment