diff --git a/compiler2/ttcn3/Ttcnstuff.cc b/compiler2/ttcn3/Ttcnstuff.cc index d198034b9ab844b610a6ad521fd904087918b197..34a1547f33216170aeef3cbc7494ac90afc44251 100644 --- a/compiler2/ttcn3/Ttcnstuff.cc +++ b/compiler2/ttcn3/Ttcnstuff.cc @@ -3463,7 +3463,7 @@ namespace Ttcn { case Common::Assignment::A_EXT_FUNCTION_RTEMP: { Def_Function_Base* local_func = dynamic_cast<Def_Function_Base*>(local_def); Def_Function_Base* base_func = dynamic_cast<Def_Function_Base*>(base_def); - if (!local_func->is_identical(base_func)) { + if (base_func->get_visibility() != PRIVATE && !local_func->is_identical(base_func)) { local_def->error("The prototype of method `%s' is not identical " "to that of inherited method `%s'", local_id.get_dispname().c_str(), base_def->get_fullname().c_str()); diff --git a/conformance_test/OOP_tests/positive_tests/pos_conf_tests.cfg b/conformance_test/OOP_tests/positive_tests/pos_conf_tests.cfg index 5ba6ddef634e54ad704f98b708fdd8a4652d40bd..b2d42d7ca6a44acb527dc4d83d968b34790c03c3 100644 --- a/conformance_test/OOP_tests/positive_tests/pos_conf_tests.cfg +++ b/conformance_test/OOP_tests/positive_tests/pos_conf_tests.cfg @@ -22,7 +22,7 @@ Sem_5010107_Methods_002.control Sem_5010107_Methods_003.control NegSem_5010107_Methods_003.control Sem_5010108_MethodInvocation_001.control -#Sem_5010109_Visibility_001.control +Sem_5010109_Visibility_001.control Sem_5010109_Visibility_002.control Sem_5010109_Visibility_003.control Sem_50101_top_level_001.control diff --git a/conformance_test/OOP_tests/positive_tests/pos_conf_tests.tpd b/conformance_test/OOP_tests/positive_tests/pos_conf_tests.tpd index 6074b21dacc91f2a755c1626c43310ff7b9027f4..20f96cac9d61da517f44b8a5ad11b3970615606b 100644 --- a/conformance_test/OOP_tests/positive_tests/pos_conf_tests.tpd +++ b/conformance_test/OOP_tests/positive_tests/pos_conf_tests.tpd @@ -48,7 +48,7 @@ <FileResource projectRelativePath="501_classes_and_objects/50101_classes/5010107_methods/Sem_5010107_Methods_003.ttcn" relativeURI="501_classes_and_objects/50101_classes/5010107_methods/Sem_5010107_Methods_003.ttcn"/> <FileResource projectRelativePath="501_classes_and_objects/50101_classes/5010107_methods/NegSem_5010107_Methods_003.ttcn" relativeURI="501_classes_and_objects/50101_classes/5010107_methods/NegSem_5010107_Methods_003.ttcn"/> <FileResource projectRelativePath="501_classes_and_objects/50101_classes/5010108_method_invocation/Sem_5010108_MethodInvocation_001.ttcn" relativeURI="501_classes_and_objects/50101_classes/5010108_method_invocation/Sem_5010108_MethodInvocation_001.ttcn"/> - <!--FileResource projectRelativePath="501_classes_and_objects/50101_classes/5010109_visibility/Sem_5010109_Visibility_001.ttcn" relativeURI="501_classes_and_objects/50101_classes/5010109_visibility/Sem_5010109_Visibility_001.ttcn"/--> + <FileResource projectRelativePath="501_classes_and_objects/50101_classes/5010109_visibility/Sem_5010109_Visibility_001.ttcn" relativeURI="501_classes_and_objects/50101_classes/5010109_visibility/Sem_5010109_Visibility_001.ttcn"/> <FileResource projectRelativePath="501_classes_and_objects/50101_classes/5010109_visibility/Sem_5010109_Visibility_002.ttcn" relativeURI="501_classes_and_objects/50101_classes/5010109_visibility/Sem_5010109_Visibility_002.ttcn"/> <FileResource projectRelativePath="501_classes_and_objects/50101_classes/5010109_visibility/Sem_5010109_Visibility_003.ttcn" relativeURI="501_classes_and_objects/50101_classes/5010109_visibility/Sem_5010109_Visibility_003.ttcn"/> <FileResource projectRelativePath="501_classes_and_objects/50101_classes/50101_top_level/Sem_50101_top_level_001.ttcn" relativeURI="501_classes_and_objects/50101_classes/50101_top_level/Sem_50101_top_level_001.ttcn"/>