| Message ID | 1427388206-4028-1-git-send-email-mike.holmes@linaro.org |
|---|---|
| State | Accepted |
| Commit | 39998ff4291ad46a4bdf19fb6ca1eba05127ecfc |
| Headers | show |
On Thu, Mar 26, 2015 at 11:43 AM, Mike Holmes <mike.holmes@linaro.org> wrote: > Signed-off-by: Mike Holmes <mike.holmes@linaro.org> > Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> > --- > platform/linux-generic/include/odp_debug_internal.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/platform/linux-generic/include/odp_debug_internal.h > b/platform/linux-generic/include/odp_debug_internal.h > index 5e38772..24608e1 100644 > --- a/platform/linux-generic/include/odp_debug_internal.h > +++ b/platform/linux-generic/include/odp_debug_internal.h > @@ -31,9 +31,9 @@ extern "C" { > /** > * Runtime assertion-macro - aborts if 'cond' is false. > */ > -#define ODP_ASSERT(cond, msg) \ > +#define ODP_ASSERT(cond) \ > do { if ((ODP_DEBUG == 1) && (!(cond))) { \ > - ODP_ERR("%s\n", msg); \ > + ODP_ERR("%s\n", #cond); \ > odp_global_data.abort_fn(); } \ > } while (0) > > -- > 2.1.0 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp >
On 26 March 2015 at 17:57, Bill Fischofer <bill.fischofer@linaro.org> wrote: > > > On Thu, Mar 26, 2015 at 11:43 AM, Mike Holmes <mike.holmes@linaro.org> > wrote: > >> Signed-off-by: Mike Holmes <mike.holmes@linaro.org> >> > > Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org> > ping > > >> --- >> platform/linux-generic/include/odp_debug_internal.h | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/platform/linux-generic/include/odp_debug_internal.h >> b/platform/linux-generic/include/odp_debug_internal.h >> index 5e38772..24608e1 100644 >> --- a/platform/linux-generic/include/odp_debug_internal.h >> +++ b/platform/linux-generic/include/odp_debug_internal.h >> @@ -31,9 +31,9 @@ extern "C" { >> /** >> * Runtime assertion-macro - aborts if 'cond' is false. >> */ >> -#define ODP_ASSERT(cond, msg) \ >> +#define ODP_ASSERT(cond) \ >> do { if ((ODP_DEBUG == 1) && (!(cond))) { \ >> - ODP_ERR("%s\n", msg); \ >> + ODP_ERR("%s\n", #cond); \ >> odp_global_data.abort_fn(); } \ >> } while (0) >> >> -- >> 2.1.0 >> >> >> _______________________________________________ >> lng-odp mailing list >> lng-odp@lists.linaro.org >> http://lists.linaro.org/mailman/listinfo/lng-odp >> > >
Merged, Maxim. On 03/27/15 00:57, Bill Fischofer wrote: > > > On Thu, Mar 26, 2015 at 11:43 AM, Mike Holmes <mike.holmes@linaro.org > <mailto:mike.holmes@linaro.org>> wrote: > > Signed-off-by: Mike Holmes <mike.holmes@linaro.org > <mailto:mike.holmes@linaro.org>> > > > Reviewed-by: Bill Fischofer <bill.fischofer@linaro.org > <mailto:bill.fischofer@linaro.org>> > > --- > platform/linux-generic/include/odp_debug_internal.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/platform/linux-generic/include/odp_debug_internal.h > b/platform/linux-generic/include/odp_debug_internal.h > index 5e38772..24608e1 100644 > --- a/platform/linux-generic/include/odp_debug_internal.h > +++ b/platform/linux-generic/include/odp_debug_internal.h > @@ -31,9 +31,9 @@ extern "C" { > /** > * Runtime assertion-macro - aborts if 'cond' is false. > */ > -#define ODP_ASSERT(cond, msg) \ > +#define ODP_ASSERT(cond) \ > do { if ((ODP_DEBUG == 1) && (!(cond))) { \ > - ODP_ERR("%s\n", msg); \ > + ODP_ERR("%s\n", #cond); \ > odp_global_data.abort_fn(); } \ > } while (0) > > -- > 2.1.0 > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org <mailto:lng-odp@lists.linaro.org> > http://lists.linaro.org/mailman/listinfo/lng-odp > > > > > _______________________________________________ > lng-odp mailing list > lng-odp@lists.linaro.org > http://lists.linaro.org/mailman/listinfo/lng-odp
diff --git a/platform/linux-generic/include/odp_debug_internal.h b/platform/linux-generic/include/odp_debug_internal.h index 5e38772..24608e1 100644 --- a/platform/linux-generic/include/odp_debug_internal.h +++ b/platform/linux-generic/include/odp_debug_internal.h @@ -31,9 +31,9 @@ extern "C" { /** * Runtime assertion-macro - aborts if 'cond' is false. */ -#define ODP_ASSERT(cond, msg) \ +#define ODP_ASSERT(cond) \ do { if ((ODP_DEBUG == 1) && (!(cond))) { \ - ODP_ERR("%s\n", msg); \ + ODP_ERR("%s\n", #cond); \ odp_global_data.abort_fn(); } \ } while (0)
Signed-off-by: Mike Holmes <mike.holmes@linaro.org> --- platform/linux-generic/include/odp_debug_internal.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)