Commits

Nikolaj Bjorner committed 9c057b8 Merge

Merge branch 'unstable' of https://git01.codeplex.com/z3 into unstable

  • Participants
  • Parent commits 82ca71e, 2583729

Comments (0)

Files changed (6)

File configure.ac

   SLIBEXTRAFLAGS="-Wl,--no-whole-archive"
   COMP_VERSIONS=
   STATIC_FLAGS=-static
+  CXXFLAGS+=" -fno-strict-aliasing"
 ], [test "${host_os:0:6}" = "CYGWIN"], [
    PLATFORM=win
    SO_EXT=.dll

File scripts/config-release.mk.in

 
 
 CXX=@CXX@
-CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -O3 -fomit-frame-pointer -Wall -fopenmp -msse -msse2 -mfpmath=sse
+CXXFLAGS=@CPPFLAGS@ @CXXFLAGS@ -c -O3 -fomit-frame-pointer -fopenmp -msse -msse2 -mfpmath=sse
 CXX_OUT_FLAG=-o
 OBJ_EXT=.o
 LIB_EXT=.a

File src/muz_qe/proof_utils.h

 
 };
 
-#endif _PROOF_UTILS_H_
+#endif

File src/muz_qe/qe_lite.h

     void operator()(expr_ref& fml, proof_ref& pr);
 };
 
-#endif __QE_LITE_H__
+#endif 

File src/test/dl_smt_relation.cpp

         Z3_fixedpoint_add_rule(ctx, dl, Z3_mk_implies(ctx, Z3_mk_and(ctx, 2, body4), pxy), 0);
 
         Z3_lbool r = Z3_fixedpoint_query(ctx, dl, pxy);
-        if (r != l_undef) {
+        if (r != Z3_L_UNDEF) {
             std::cout << Z3_ast_to_string(ctx, Z3_fixedpoint_get_answer(ctx, dl)) << "\n";
         }
 

File src/test/map.cpp

 #include"str_hashtable.h"
 
 static void tst1() {
-  map<char *, int, str_hash_proc, str_eq_proc> str2int;
+  map<char const *, int, str_hash_proc, str_eq_proc> str2int;
   str2int.insert("foo", 35);
   SASSERT(str2int.contains("foo"));
   SASSERT(str2int.find_iterator("foo") != str2int.end());