From: Jan Rheinländer <jrheinlaender@gmx.de>
Date: Tue, 1 May 2018 18:43:04 +0000 (+0200)
Subject: Remove MSVC-specific definition of __func__ and __alignof__.
X-Git-Tag: release_1-7-5~12
X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=commitdiff_plain;h=f49f9a14764515fd7c2ddc20d7c7cb651ba25cc0

Remove MSVC-specific definition of __func__ and __alignof__.

They are not required any more in C++11.
---

diff --git a/ginac/compiler.h b/ginac/compiler.h
index 5b438e72..d307bf7d 100644
--- a/ginac/compiler.h
+++ b/ginac/compiler.h
@@ -33,9 +33,4 @@
 #define attribute_deprecated
 #endif
 
-#ifdef _MSC_VER
-#define __func__ __FUNCTION__
-#define __alignof__ __alignof
-#endif
-
 #endif // ndef GINAC_COMPILER_DEP_H
diff --git a/ginac/polynomial/primes_factory.h b/ginac/polynomial/primes_factory.h
index 3227ecdd..60d862f1 100644
--- a/ginac/polynomial/primes_factory.h
+++ b/ginac/polynomial/primes_factory.h
@@ -47,7 +47,7 @@ private:
 	// or even numeric. Eventually this will be fixed).
 	cln::cl_I last;
 	// This ensures coefficients are immediate.
-	static const int immediate_bits = 8*sizeof(void *) - __alignof__(void *);
+	static const int immediate_bits = 8*sizeof(void *) - alignof(void *);
 	static const long opt_hint = (1L << (immediate_bits >> 1)) - 1;
 public:
 	primes_factory()