ExternalVendorCode/trick
1
0
Fork 0
mirror of https://github.com/nasa/trick.git synced 2025-01-18 18:56:31 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Fix compiler shadow warning for issue #1141 (#1150)

Browse Source 
closes #1141 

If you use the -Wshadow flag, there are few compiler warnings
for shadowing. You can recreate with the Ball L1 sim:

    % vi S_overrides.mk
    TRICK_CFLAGS += -Wshadow -I../models
    TRICK_CXXFLAGS += -Wshadow -I../models
    % trick-CP
    ...

    In file included from build/S_source.cpp:3:0:
    build/../S_source.hh: In member function ‘void EventManagerSimObject::create_thread_process_event()’:
    build/../S_source.hh:425:23: warning: declaration of ‘name’ shadows a member of 'this' [-Wshadow]
    char* name = strdup(oss.str().c_str()) ;

To fix the S_source* generated code, it is just a
matter of changing default_trick_sys.sm.
This commit is contained in:
Keith Vetter 2021-05-26 22:13:31 -05:00 committed by GitHub
parent acdc60050c
commit 832fc4e8a7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
share/trick/sim_objects/default_trick_sys.sm
View File

@ -387,10 +387,10 @@ class EventManagerSimObject : public Trick::SimObject {
std::ostringstream oss ;
oss << "thread_process_event_" << ii ;
thread_process_event_so.push_back(tpeso) ;
char* name = strdup(oss.str().c_str()) ;
thread_process_event_so_names.push_back(name) ;
exec_add_sim_object(tpeso, name) ;
TMM_declare_ext_var(tpeso, TRICK_STRUCTURED,"ThreadProcessEventSimObject", 0, name, 0, NULL) ;
char* tpe_name = strdup(oss.str().c_str()) ;
thread_process_event_so_names.push_back(tpe_name) ;
exec_add_sim_object(tpeso, tpe_name) ;
TMM_declare_ext_var(tpeso, TRICK_STRUCTURED,"ThreadProcessEventSimObject", 0, tpe_name, 0, NULL) ;
// Add the child thread event processor.
em.add_event_processor(&(tpeso->ep)) ;
}
@ -767,10 +767,10 @@ class InjectorSimObject : public Trick::SimObject {
std::ostringstream oss ;
oss << "trick_injector_executor_" << ii ;
injector_executor_so.push_back(ieso) ;
char* name = strdup(oss.str().c_str()) ;
injector_executor_so_names.push_back(name);
exec_add_sim_object(ieso, name) ;
TMM_declare_ext_var(ieso, TRICK_STRUCTURED,"InjectorExecSimObject", 0, name, 0, NULL) ;
char* injector_name = strdup(oss.str().c_str()) ;
injector_executor_so_names.push_back(injector_name);
exec_add_sim_object(ieso, injector_name) ;
TMM_declare_ext_var(ieso, TRICK_STRUCTURED,"InjectorExecSimObject", 0, injector_name, 0, NULL) ;
// Add the child thread realtime injector.
rtis.AddInjectorExecutor(&(ieso->rtie)) ;
}