[bugfix] Bug fix with git merge

Git merged new commits causing build errors
Need urgent merge

Signed-off-by: Parichay Kapoor <pk.kapoor@samsung.com>

diff --git a/test/tizen_capi/unittest_tizen_capi.cpp b/test/tizen_capi/unittest_tizen_capi.cpp
index 8c30e800923ff90c6f5f8db56b61445fa64fcfa7..0c67a9bc0c8928ce31e6d4e94fb8407def2ff52b 100644 (file)
--- a/test/tizen_capi/unittest_tizen_capi.cpp
+++ b/test/tizen_capi/unittest_tizen_capi.cpp
@@ -288,10 +288,10 @@ TEST(nntrainer_capi_nnmodel, addLayer_05_n) {
   replaceString("Layers = inputlayer outputlayer",
                 "Layers = inputlayer outputlayer", config_file, config_str);
 
-  status = ml_nnmodel_construct_with_conf(config_file.c_str(), &model);
+  status = ml_nnmodel_construct(&model);
   EXPECT_EQ(status, ML_ERROR_NONE);
 
-  status = ml_nnmodel_compile_with_conf(model);
+  status = ml_nnmodel_compile_with_conf(config_file.c_str(), model);
   EXPECT_EQ(status, ML_ERROR_NONE);
 
   status = ml_nnlayer_create(&layer, ML_LAYER_TYPE_FC);