mirror of
				https://github.com/Z3Prover/z3
				synced 2025-11-04 05:19:11 +00:00 
			
		
		
		
	Bugfixes for compilation in Cygwin (WIN32 -> _WINDOWS)
Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
		
							parent
							
								
									e077fc5cb4
								
							
						
					
					
						commit
						d51d9b18f9
					
				
					 4 changed files with 11 additions and 11 deletions
				
			
		| 
						 | 
				
			
			@ -25,7 +25,7 @@ Revision History:
 | 
			
		|||
#include <map>
 | 
			
		||||
 | 
			
		||||
// make hash_map and hash_set available
 | 
			
		||||
#ifndef WIN32
 | 
			
		||||
#ifndef _WINDOWS
 | 
			
		||||
using namespace stl_ext;
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -782,7 +782,7 @@ protected:
 | 
			
		|||
      };
 | 
			
		||||
 | 
			
		||||
      
 | 
			
		||||
#ifdef WIN32
 | 
			
		||||
#ifdef _WINDOWS
 | 
			
		||||
       __declspec(dllexport)
 | 
			
		||||
#endif
 | 
			
		||||
       void FromClauses(const std::vector<Term> &clauses);
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1402,7 +1402,7 @@ namespace hash_space {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
// to make Duality::ast hashable in windows
 | 
			
		||||
#ifdef WIN32 
 | 
			
		||||
#ifdef _WINDOWS 
 | 
			
		||||
template <> inline
 | 
			
		||||
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
 | 
			
		||||
#ifdef WIN32 
 | 
			
		||||
#ifdef _WINDOWS 
 | 
			
		||||
template <> inline
 | 
			
		||||
size_t stdext::hash_value<Duality::func_decl >(const Duality::func_decl& s)
 | 
			
		||||
{	
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -42,7 +42,7 @@ Revision History:
 | 
			
		|||
#include <ext/hash_map>
 | 
			
		||||
#include <ext/hash_set>
 | 
			
		||||
#else
 | 
			
		||||
#ifdef WIN32
 | 
			
		||||
#ifdef _WINDOWS
 | 
			
		||||
#define stl_ext stdext
 | 
			
		||||
#define hash_space std
 | 
			
		||||
#include <hash_map>
 | 
			
		||||
| 
						 | 
				
			
			@ -61,7 +61,7 @@ Revision History:
 | 
			
		|||
 | 
			
		||||
// stupid STL doesn't include hash function for class string
 | 
			
		||||
 | 
			
		||||
#ifndef WIN32 
 | 
			
		||||
#ifndef _WINDOWS 
 | 
			
		||||
 | 
			
		||||
namespace stl_ext {
 | 
			
		||||
  template <>
 | 
			
		||||
| 
						 | 
				
			
			@ -86,7 +86,7 @@ namespace hash_space {
 | 
			
		|||
  };
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
#ifdef WIN32 
 | 
			
		||||
#ifdef _WINDOWS 
 | 
			
		||||
template <> inline
 | 
			
		||||
size_t stdext::hash_value<std::pair<int,int> >(const std::pair<int,int>& p)
 | 
			
		||||
{	// 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
 | 
			
		||||
 | 
			
		||||
#ifdef WIN32
 | 
			
		||||
#ifdef _WINDOWS
 | 
			
		||||
 | 
			
		||||
namespace std {
 | 
			
		||||
    template <>
 | 
			
		||||
| 
						 | 
				
			
			@ -139,7 +139,7 @@ namespace std {
 | 
			
		|||
#endif
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#ifndef WIN32
 | 
			
		||||
#ifndef _WINDOWS
 | 
			
		||||
 | 
			
		||||
#if 0
 | 
			
		||||
namespace stl_ext {
 | 
			
		||||
| 
						 | 
				
			
			@ -155,7 +155,7 @@ namespace stl_ext {
 | 
			
		|||
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef WIN32
 | 
			
		||||
#ifdef _WINDOWS
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -127,7 +127,7 @@ namespace hash_space {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
// to make ast_r hashable in windows
 | 
			
		||||
#ifdef WIN32 
 | 
			
		||||
#ifdef _WINDOWS 
 | 
			
		||||
template <> inline
 | 
			
		||||
size_t stdext::hash_value<ast_r >(const ast_r& s)
 | 
			
		||||
{	
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue