← Back to branch summary

~tes/goby/2.1-git

« back to all changes in this revision

Viewing changes to src/moos/goby_moos_app.h

  • Committer: Toby Schneider
  • Date: 2018-02-23 20:35:30 UTC
  • Revision ID: git-v1:438b3bdd41d18d6e45092dbe0fc32f0c0a527a79
Fixed bug where optional submessages in the GobyMOOSApp config would appear set even if they weren't (due to the fetch_moos_globals function)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/moos/goby_moos_app.h
599
599
        switch(field_desc->cpp_type())
600
600
        {
601
601
            case google::protobuf::FieldDescriptor::CPPTYPE_MESSAGE:
 
602
            {
 
603
                bool message_was_empty = !refl->HasField(*msg, field_desc);
602
604
                fetch_moos_globals(refl->MutableMessage(msg, field_desc), moos_file_reader);
 
605
                std::vector<const google::protobuf::FieldDescriptor*> set_fields;
 
606
                refl->ListFields(refl->GetMessage(*msg, field_desc), &set_fields);
 
607
                std::cout << field_desc->DebugString() << set_fields.size() << std::endl;
 
608
                if(set_fields.empty() && message_was_empty)
 
609
                    refl->ClearField(msg, field_desc);
 
610
                
603
611
                break;    
604
 
                    
 
612
            }
 
613
            
605
614
            case google::protobuf::FieldDescriptor::CPPTYPE_INT32:
606
615
            {
607
616
                int result;