Merge pull request #150 from ppank5/master

Bugfix: bug 568694

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());

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

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"/>