]> git.unchartedbackwaters.co.uk Git - francis/stp.git/commit
Patch from Markus Groß. Thanks. Here is the description that Markus provided:
authortrevor_hansen <trevor_hansen@e59a4935-1847-0410-ae03-e826735625c1>
Sun, 28 Nov 2010 02:45:43 +0000 (02:45 +0000)
committertrevor_hansen <trevor_hansen@e59a4935-1847-0410-ae03-e826735625c1>
Sun, 28 Nov 2010 02:45:43 +0000 (02:45 +0000)
commit8d4a9b77bf2ec860f0afe558571daf7349ae4003
tree8901537e26b78422123be5f4b736e822eea5992c
parenteaf75336485859e726b344bad789b5e63a430ff2
Patch from Markus Groß. Thanks. Here is the description that Markus provided:

1. To fix a missing boost header the src/sat/Makefile has to be fixed
This is mentioned and described here: http://groups.google.com/group/stp-users/browse_thread/thread/94246a7cf288d57

2. To fix compile errors regarding PRIu64 the src/sat/mtl/IntTypes.h has to be renamed.
Because most osx systems have a case insensitive file system #include <inttypes.h> includes the src/sat/mtl/IntTypes.h and therefore the inttypes.h from the c library is never included.
I renamed the file from IntTypes.h to IntTypesMtl.h.
This fixes the bug reported here: http://groups.google.com/group/stp-users/browse_thread/thread/c00ab4b90c4ae86a

3. In src/sat/cryptominisat2/ClauseAllocator.h I changed two variable types from uint to uint32_t (otherwise I get: unknown type uint)

4. In src/sat/utils/System.cc
The part ifdef __APPLE__ is missing the memUsedPeak function which leads to an linker error.

git-svn-id: https://stp-fast-prover.svn.sourceforge.net/svnroot/stp-fast-prover/trunk/stp@1028 e59a4935-1847-0410-ae03-e826735625c1
src/sat/Makefile
src/sat/core/SolverTypes.h
src/sat/cryptominisat2/ClauseAllocator.h
src/sat/mtl/IntTypesMtl.h [moved from src/sat/mtl/IntTypes.h with 100% similarity]
src/sat/mtl/Map.h
src/sat/mtl/Vec.h
src/sat/utils/Options.h
src/sat/utils/System.cc
src/sat/utils/System.h