Revert back Armadillo to 9.800.x

This commit is contained in:
Carles Fernandez 2019-10-05 03:32:53 +02:00
parent c9e03557b7
commit af2d38bed9
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 13 additions and 13 deletions

View File

@ -401,7 +401,7 @@ set(GNSSSDR_PROTOBUF_MIN_VERSION "3.0.0")
################################################################################ ################################################################################
set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2") set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0") set(GNSSSDR_GLOG_LOCAL_VERSION "0.4.0")
set(GNSSSDR_ARMADILLO_LOCAL_VERSION "10.100.x") set(GNSSSDR_ARMADILLO_LOCAL_VERSION "9.800.x")
set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0") set(GNSSSDR_GTEST_LOCAL_VERSION "1.10.0")
set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master") set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12") set(GNSSSDR_GPSTK_LOCAL_VERSION "2.12")

View File

@ -6,21 +6,21 @@
#undef ADVANCE #undef ADVANCE
#define ADVANCE(num_bytes) do { \ #define ADVANCE(num_bytes) do { \
size_t num = num_bytes; \ size_t num = num_bytes; \
ptr = ((const char *)ptr) + num; \ ptr = ((const char *)ptr) + num; \
size -= num; \ size -= num; \
consumed_myself += num; \ consumed_myself += num; \
} while(0) } while(0)
#undef RETURN #undef RETURN
#define RETURN(_code) do { \ #define RETURN(_code) do { \
asn_dec_rval_t rval; \ asn_dec_rval_t rval; \
rval.code = _code; \ rval.code = _code; \
if(opt_ctx) opt_ctx->step = step; /* Save context */ \ if(opt_ctx) opt_ctx->step = step; /* Save context */ \
if((_code) == RC_OK || opt_ctx) \ if((_code) == RC_OK || opt_ctx) \
rval.consumed = consumed_myself; \ rval.consumed = consumed_myself; \
else \ else \
rval.consumed = 0; /* Context-free */ \ rval.consumed = 0; /* Context-free */ \
return rval; \ return rval; \
} while(0) } while(0)
/* /*