Fixed merge conflicts

doc/sphinx/source/context-operations.rst

@@ -993,15 +993,14 @@ record is no longer needed, it can be deleted by
      -- error code: :c:enum:`CTX_INVALID_PARAMETER_VALUE`
 
 
-.. c:function:: void yices_default_params_for_context(context_t *ctx, param_t *p)
+.. c:function:: void yices_default_params_for_context(const context_t *ctx, param_t *p)
 
    Set all the parameters in record *p* to values appropriate for
    context *ctx*.  The parameter settings depend on the logic
    supported by *ctx* and are based on empirical evaluation on
    benchmarks in the same logic.
 
 
-
 .. c:function:: void yices_free_param_record(param_t* param)
 
    Deletes a parameter record.

src/api/yices_api.c

@@ -8856,9 +8856,7 @@ void yices_set_default_params(param_t *params, smt_logic_t logic, context_arch_t
  * Set default search parameters for ctx (based on architecture and theories)
  * - this is based on benchmarking on the SMT-LIB 1.2 benchmarks (cf. yices_smtcomp.c)
  */
-//MT_PROTECT(,  __yices_globals.lock, );
-//MT_PROTECT(, ctx->lock, );
-EXPORTED void yices_default_params_for_context(context_t *ctx, param_t *params) {
+EXPORTED void yices_default_params_for_context(const context_t *ctx, param_t *params) {
   yices_set_default_params(params, ctx->logic, ctx->arch, ctx->mode);
 }
 

src/include/yices.h

@@ -3200,7 +3200,7 @@ __YICES_DLLSPEC__ extern param_t *yices_new_param_record(void);
 /*
  * Set default search parameters for ctx.
  */
-__YICES_DLLSPEC__ extern void yices_default_params_for_context(context_t *ctx, param_t *params);
+__YICES_DLLSPEC__ extern void yices_default_params_for_context(const context_t *ctx, param_t *params);
 
 
 /*