Merge branch 'devel/master' into tizen

[platform/core/uifw/dali-core.git] / dali / internal / event / common / type-registry-impl.cpp

diff --git a/dali/internal/event/common/type-registry-impl.cpp b/dali/internal/event/common/type-registry-impl.cpp
index dd947a2..5d61e49 100644 (file)
--- a/dali/internal/event/common/type-registry-impl.cpp
+++ b/dali/internal/event/common/type-registry-impl.cpp
@@ -158,7 +158,7 @@ bool TypeRegistry::Register( const std::string& uniqueTypeName, const std::type_
 }
 
 bool TypeRegistry::Register( const std::string& uniqueTypeName, const std::type_info& baseTypeInfo,
-    Dali::CSharpTypeInfo::CreateFunction createInstance, bool callCreateOnInit  )
+    Dali::CSharpTypeInfo::CreateFunction createInstance )
 {
 
   bool ret = false;
@@ -178,10 +178,7 @@ bool TypeRegistry::Register( const std::string& uniqueTypeName, const std::type_
     DALI_LOG_WARNING("Duplicate name for TypeRegistry for '%s'\n", + uniqueTypeName.c_str());
     DALI_ASSERT_ALWAYS(!"Duplicate type name for Type Registation");
   }
-  if( callCreateOnInit )
-  {
-    mCSharpInitFunctions.push_back(createInstance);
-  }
+
   return ret;
 
 }
@@ -192,10 +189,6 @@ void TypeRegistry::CallInitFunctions(void) const
   {
     (*iter)();
   }
-  for( CSharpInitFunctions::const_iterator iter = mCSharpInitFunctions.begin(); iter != mCSharpInitFunctions.end(); ++iter)
-  {
-    (*iter)();
-  }
 }
 
 std::string TypeRegistry::RegistrationName( const std::type_info& registerType )