mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-21 11:52:05 +00:00
Code Activity

fix the build with VS

Browse source 
Signed-off-by: Nuno Lopes <a-nlopes@microsoft.com>
This commit is contained in:
Nuno Lopes 2015-03-02 09:18:15 +00:00
parent 8bcd6edd08
commit e64760abbd
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/util/memory_manager.h
View file

@ -34,7 +34,7 @@ Revision History:
# define GCC_RET_NON_NULL # define GCC_RET_NON_NULL
# endif # endif
# define ALLOC_ATTR __attribute__((malloc)) GCC_RET_NON_NULL # define ALLOC_ATTR __attribute__((malloc)) GCC_RET_NON_NULL
#elif defined(_WINDOWS) && (VisualStudioVersion >= 13) #elif defined(_WINDOWS)
# define ALLOC_ATTR __declspec(restrict) # define ALLOC_ATTR __declspec(restrict)
#else #else
# define ALLOC_ATTR # define ALLOC_ATTR
@ -57,10 +57,10 @@ public:
static void display_max_usage(std::ostream& os); static void display_max_usage(std::ostream& os);
static void display_i_max_usage(std::ostream& os); static void display_i_max_usage(std::ostream& os);
static void deallocate(void* p); static void deallocate(void* p);
static void* allocate(size_t s) ALLOC_ATTR; static ALLOC_ATTR void* allocate(size_t s);
#if _DEBUG #if _DEBUG
static void deallocate(char const* file, int line, void* p); static void deallocate(char const* file, int line, void* p);
static void* allocate(char const* file, int line, char const* obj, size_t s) ALLOC_ATTR; static ALLOC_ATTR void* allocate(char const* file, int line, char const* obj, size_t s);
#endif #endif
static unsigned long long get_allocation_size(); static unsigned long long get_allocation_size();
static unsigned long long get_max_used_memory(); static unsigned long long get_max_used_memory();
@ -95,7 +95,7 @@ void dealloc(T * ptr) {
#endif #endif
template<typename T> template<typename T>
T * alloc_vect(unsigned sz) ALLOC_ATTR; ALLOC_ATTR T * alloc_vect(unsigned sz);
template<typename T> template<typename T>
T * alloc_vect(unsigned sz) { T * alloc_vect(unsigned sz) {