Merge branch 'fix/kernel/bool-conversion' into 'master'

[tests] update oracle following kernel changes

See merge request frama-c/frama-clang!185

tests/stl/oracle/stl_functional.res.oracle

@@ -2278,7 +2278,9 @@ void function<int&,<abst>>::Ctor(struct function<int&,<abst>> const *this,
 void function<int&,<abst>>::Ctor(struct function<int&,<abst>> const *this,
                                  int (*f)(int const *, int const *))
 {
-  if (! ((_Bool)(f != 0))) this->_f = (int (*)(int const *, int const *))0;
+  if (! ((_Bool)(f != (int (*)(int const *, int const *))0))) this->_f = (int (*)
+                                                              (int const *,
+                                                               int const *))0;
   else this->_f = f;
   return;
 }
@@ -2289,7 +2291,7 @@ void function<int&,<abst>>::Ctor(struct function<int&,<abst>> const *this,
 {
   __funtype tmp;
   tmp = __funtype)(& f._frama_c__ZN3stdE7__binopIiN3stdE7__minusE);
-  if ((_Bool)(tmp != 0)) this->_f = __funtype)(& f._frama_c__ZN3stdE7__binopIiN3stdE7__minusE);
+  if ((_Bool)(tmp != (__funtype)0)) this->_f = __funtype)(& f._frama_c__ZN3stdE7__binopIiN3stdE7__minusE);
   else this->_f = (int (*)(int const *, int const *))0;
   return;
 }
@@ -2300,7 +2302,7 @@ void function<int&,<abst>>::Ctor(struct function<int&,<abst>> const *this,
 {
   __funtype tmp;
   tmp = __funtype)(& f._frama_c__ZN3stdE7__binopIiN3stdE6__plusE);
-  if ((_Bool)(tmp != 0)) this->_f = __funtype)(& f._frama_c__ZN3stdE7__binopIiN3stdE6__plusE);
+  if ((_Bool)(tmp != (__funtype)0)) this->_f = __funtype)(& f._frama_c__ZN3stdE7__binopIiN3stdE6__plusE);
   else this->_f = (int (*)(int const *, int const *))0;
   return;
 }
@@ -2390,7 +2392,7 @@ int operator()(struct function<int&,<abst>> *this, int const *arg1,
   int tmp_1;
   int const *tmp;
   int const *tmp_0;
-  if (! ((_Bool)(this->_f != 0))) {
+  if (! ((_Bool)(this->_f != (int (*)(int const *, int const *))0))) {
     struct bad_function_call __fc_tmp_5;
     bad_function_call::Ctor(& __fc_tmp_5);
     __fc_exn.exn_uncaught = 1;

tests/stl/oracle/stl_shared_ptr_mistake5.res.oracle

@@ -3109,7 +3109,7 @@ void mistake5(void)
   __fc_tmp_2 = (struct Aircraft *)malloc(sizeof(struct Aircraft));
   Aircraft::Ctor((struct Aircraft const *)__fc_tmp_2,5);
   myAircraft5 = __fc_tmp_2;
-  if ((_Bool)(myAircraft5 != 0)) {
+  if ((_Bool)(myAircraft5 != (struct Aircraft *)0)) {
     struct shared_ptr<Aircraft> pAircraft51;
     shared_ptr<Aircraft>::Ctor(& pAircraft51,myAircraft5);
     struct shared_ptr<Aircraft> pAircraft52;