Skip to content
Snippets Groups Projects
Commit bbaab17b authored by Allan Blanchard's avatar Allan Blanchard
Browse files

Merge branch 'feature/ocaml-4-13' into 'master'

prefer OCaml 4.13 new String functions over Extlib's

See merge request frama-c/meta!80
parents bcd5947f 3eb55d65
No related branches found
No related tags found
No related merge requests found
...@@ -15,7 +15,7 @@ default: ...@@ -15,7 +15,7 @@ default:
variables: variables:
DEFAULT: "master" DEFAULT: "master"
OCAML: "4.11" OCAML: "4.13"
################################################################################ ################################################################################
### TESTS ### TESTS
......
...@@ -28,7 +28,7 @@ open Cil_types ...@@ -28,7 +28,7 @@ open Cil_types
*) *)
let is_not_orig_variable lv = let is_not_orig_variable lv =
lv.lv_name = "__retres" || lv.lv_name = "__retres" ||
Extlib.string_prefix "__fc_" lv.lv_name || String.starts_with ~prefix:"__fc_" lv.lv_name ||
match lv.lv_origin with match lv.lv_origin with
| Some v -> | Some v ->
not v.vsource || v.vtemp || not v.vsource || v.vtemp ||
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment