diff options
Diffstat (limited to 'src/usr')
| -rw-r--r-- | src/usr/pnor/pnordd.H | 1 | ||||
| -rw-r--r-- | src/usr/targeting/common/utilFilter.C | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/usr/pnor/pnordd.H b/src/usr/pnor/pnordd.H index 8752768ed..25c670440 100644 --- a/src/usr/pnor/pnordd.H +++ b/src/usr/pnor/pnordd.H @@ -298,7 +298,6 @@ class PnorDD /** -<<<<<<< HEAD * @brief LPC Slave Registers * These are offsets within the LPC Slave Register Space */ diff --git a/src/usr/targeting/common/utilFilter.C b/src/usr/targeting/common/utilFilter.C index e926e2033..f31701b6d 100644 --- a/src/usr/targeting/common/utilFilter.C +++ b/src/usr/targeting/common/utilFilter.C @@ -62,7 +62,7 @@ void _getClassResources( TARGETING::TargetHandleList & o_vector, CLASS i_class, TYPE i_type, ResourceState i_state ) { #define TARG_FN "_getClassResources(...)" - TARG_ENTER(); + switch(i_state) { case UTIL_FILTER_ALL: @@ -182,7 +182,6 @@ void _getClassResources( TARGETING::TargetHandleList & o_vector, std::sort(o_vector.begin(),o_vector.end(),compareTargetHuid); } - TARG_EXIT(); #undef TARG_FN } |
