mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-07-19 10:52:02 +00:00
Code Activity

Bugfixes for compilation in Cygwin (WIN32 -> _WINDOWS)

Browse source 
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2014-02-21 13:00:02 +00:00
parent e077fc5cb4
commit d51d9b18f9
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/duality/duality.h
View file

@ -25,7 +25,7 @@ Revision History:
#include <map> #include <map>
// make hash_map and hash_set available // make hash_map and hash_set available
#ifndef WIN32 #ifndef _WINDOWS
using namespace stl_ext; using namespace stl_ext;
#endif #endif
@ -782,7 +782,7 @@ protected:
}; };
#ifdef WIN32 #ifdef _WINDOWS
__declspec(dllexport) __declspec(dllexport)
#endif #endif
void FromClauses(const std::vector<Term> &clauses); void FromClauses(const std::vector<Term> &clauses);

4
src/duality/duality_wrapper.h
View file

@ -1402,7 +1402,7 @@ namespace hash_space {
} }
// to make Duality::ast hashable in windows // to make Duality::ast hashable in windows
#ifdef WIN32 #ifdef _WINDOWS
template <> inline template <> inline
size_t stdext::hash_value<Duality::ast >(const Duality::ast& s) size_t stdext::hash_value<Duality::ast >(const Duality::ast& s)
{ {
@ -1446,7 +1446,7 @@ namespace hash_space {
} }
// to make Duality::func_decl hashable in windows // to make Duality::func_decl hashable in windows
#ifdef WIN32 #ifdef _WINDOWS
template <> inline template <> inline
size_t stdext::hash_value<Duality::func_decl >(const Duality::func_decl& s) size_t stdext::hash_value<Duality::func_decl >(const Duality::func_decl& s)
{ {

12
src/interp/iz3hash.h
View file

@ -42,7 +42,7 @@ Revision History:
#include <ext/hash_map> #include <ext/hash_map>
#include <ext/hash_set> #include <ext/hash_set>
#else #else
#ifdef WIN32 #ifdef _WINDOWS
#define stl_ext stdext #define stl_ext stdext
#define hash_space std #define hash_space std
#include <hash_map> #include <hash_map>
@ -61,7 +61,7 @@ Revision History:
// stupid STL doesn't include hash function for class string // stupid STL doesn't include hash function for class string
#ifndef WIN32 #ifndef _WINDOWS
namespace stl_ext { namespace stl_ext {
template <> template <>
@ -86,7 +86,7 @@ namespace hash_space {
}; };
} }
#ifdef WIN32 #ifdef _WINDOWS
template <> inline template <> inline
size_t stdext::hash_value<std::pair<int,int> >(const std::pair<int,int>& p) size_t stdext::hash_value<std::pair<int,int> >(const std::pair<int,int>& p)
{ // hash _Keyval to size_t value one-to-one { // hash _Keyval to size_t value one-to-one
@ -112,7 +112,7 @@ size_t stdext::hash_value<std::pair<T *, T *> >(const std::pair<T *, T *>& p)
} }
#endif #endif
#ifdef WIN32 #ifdef _WINDOWS
namespace std { namespace std {
template <> template <>
@ -139,7 +139,7 @@ namespace std {
#endif #endif
#ifndef WIN32 #ifndef _WINDOWS
#if 0 #if 0
namespace stl_ext { namespace stl_ext {
@ -155,7 +155,7 @@ namespace stl_ext {
#endif #endif
#ifdef WIN32 #ifdef _WINDOWS

2
src/interp/iz3mgr.h
View file

@ -127,7 +127,7 @@ namespace hash_space {
} }
// to make ast_r hashable in windows // to make ast_r hashable in windows
#ifdef WIN32 #ifdef _WINDOWS
template <> inline template <> inline
size_t stdext::hash_value<ast_r >(const ast_r& s) size_t stdext::hash_value<ast_r >(const ast_r& s)
{ {