From 49de908a30e3192d4599dff73f1c838025889d1c Mon Sep 17 00:00:00 2001 From: Alex Lin Date: Thu, 18 Feb 2016 11:04:07 -0600 Subject: [PATCH] Functions with enumerated default arguments cause bad python code to be generated OK, all the previous checkins were the wrong way to fix this issue. The SWIG compactdefaultargs feature and the shadow feature clash for our DRBinary class. I turn off compactdefaultargs for the DRBinary class, leaving it on for everything else. refs #176 --- trick_source/sim_services/Clock/test/.gitignore | 1 + trick_source/sim_services/DataRecord/include/DRBinary.hh | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/trick_source/sim_services/Clock/test/.gitignore b/trick_source/sim_services/Clock/test/.gitignore index 8ed8bd85..7aadd580 100644 --- a/trick_source/sim_services/Clock/test/.gitignore +++ b/trick_source/sim_services/Clock/test/.gitignore @@ -1,3 +1,4 @@ *.o BC635Clock_test TPROCTEClock_test +GetTimeOfDayClock_test diff --git a/trick_source/sim_services/DataRecord/include/DRBinary.hh b/trick_source/sim_services/DataRecord/include/DRBinary.hh index 22c582d6..78c4716e 100644 --- a/trick_source/sim_services/DataRecord/include/DRBinary.hh +++ b/trick_source/sim_services/DataRecord/include/DRBinary.hh @@ -14,6 +14,7 @@ PROGRAMMERS: #include "sim_services/DataRecord/include/DataRecordGroup.hh" #ifdef SWIG +%feature("compactdefaultargs","0") ; %feature("shadow") Trick::DRBinary::DRBinary(std::string in_name) %{ def __init__(self, *args): this = $action(*args) @@ -122,4 +123,8 @@ namespace Trick { } ; +#ifdef SWIG +%feature("compactdefaultargs","1") ; +#endif + #endif