Merge pull request #13 from jkm/master

Fix compiling with -property

Author: WalterBright

deimos/openssl/cms.d

@@ -132,7 +132,7 @@ int CMS_set_detached(CMS_ContentInfo* cms, int detached);
 
 // #ifdef HEADER_PEM_H
 import deimos.openssl.pem;
-mixin(DECLARE_PEM_rw_const!("CMS", "CMS_ContentInfo"));
+mixin(DECLARE_PEM_rw_const!("CMS", "CMS_ContentInfo")());
 // #endif
 
 int CMS_stream(ubyte*** boundary, CMS_ContentInfo* cms);

deimos/openssl/pem.d

@@ -378,38 +378,38 @@ version (OPENSSL_NO_BIO) {
 }
 
 string DECLARE_PEM_write(string name, string type)() {
-	return DECLARE_PEM_write_bio!(name, type) ~ "\n" ~
-	       DECLARE_PEM_write_fp!(name, type);
+	return DECLARE_PEM_write_bio!(name, type)() ~ "\n" ~
+	       DECLARE_PEM_write_fp!(name, type)();
 }
 
 string DECLARE_PEM_write_const(string name, string type)() {
-	return DECLARE_PEM_write_bio_const!(name, type) ~ "\n" ~
-	       DECLARE_PEM_write_fp_const!(name, type);
+	return DECLARE_PEM_write_bio_const!(name, type)() ~ "\n" ~
+	       DECLARE_PEM_write_fp_const!(name, type)();
 }
 
 string DECLARE_PEM_write_cb(string name, string type)() {
-	return DECLARE_PEM_write_cb_bio!(name, type) ~ "\n" ~
-	       DECLARE_PEM_write_cb_fp!(name, type);
+	return DECLARE_PEM_write_cb_bio!(name, type)() ~ "\n" ~
+	       DECLARE_PEM_write_cb_fp!(name, type)();
 }
 
 string DECLARE_PEM_read(string name, string type)() {
-	return DECLARE_PEM_read_bio!(name, type) ~ "\n" ~
-	       DECLARE_PEM_read_fp!(name, type);
+	return DECLARE_PEM_read_bio!(name, type)() ~ "\n" ~
+	       DECLARE_PEM_read_fp!(name, type)();
 }
 
 string DECLARE_PEM_rw(string name, string type)() {
-	return DECLARE_PEM_read!(name, type) ~ "\n" ~
-	       DECLARE_PEM_write!(name, type);
+	return DECLARE_PEM_read!(name, type)() ~ "\n" ~
+	       DECLARE_PEM_write!(name, type)();
 }
 
 string DECLARE_PEM_rw_const(string name, string type)() {
-	return DECLARE_PEM_read!(name, type) ~ "\n" ~
-	       DECLARE_PEM_write_const!(name, type);
+	return DECLARE_PEM_read!(name, type)() ~ "\n" ~
+	       DECLARE_PEM_write_const!(name, type)();
 }
 
 string DECLARE_PEM_rw_cb(string name, string type)() {
-	return DECLARE_PEM_read!(name, type) ~ "\n" ~
-	       DECLARE_PEM_write_cb!(name, type);
+	return DECLARE_PEM_read!(name, type)() ~ "\n" ~
+	       DECLARE_PEM_write_cb!(name, type)();
 }
 
 version (all) {
@@ -473,56 +473,56 @@ void	PEM_dek_info(char* buf, const(char)* type, int len, char* str);
 
 public import deimos.openssl.symhacks;
 
-mixin(DECLARE_PEM_rw!("X509", "X509"));
+mixin(DECLARE_PEM_rw!("X509", "X509")());
 
-mixin(DECLARE_PEM_rw!("X509_AUX", "X509"));
+mixin(DECLARE_PEM_rw!("X509_AUX", "X509")());
 
-mixin(DECLARE_PEM_rw!("X509_CERT_PAIR", "X509_CERT_PAIR"));
+mixin(DECLARE_PEM_rw!("X509_CERT_PAIR", "X509_CERT_PAIR")());
 
-mixin(DECLARE_PEM_rw!("X509_REQ", "X509_REQ"));
-mixin(DECLARE_PEM_write!("X509_REQ_NEW", "X509_REQ"));
+mixin(DECLARE_PEM_rw!("X509_REQ", "X509_REQ")());
+mixin(DECLARE_PEM_write!("X509_REQ_NEW", "X509_REQ")());
 
-mixin(DECLARE_PEM_rw!("X509_CRL", "X509_CRL"));
+mixin(DECLARE_PEM_rw!("X509_CRL", "X509_CRL")());
 
-mixin(DECLARE_PEM_rw!("PKCS7", "PKCS7"));
+mixin(DECLARE_PEM_rw!("PKCS7", "PKCS7")());
 
-mixin(DECLARE_PEM_rw!("NETSCAPE_CERT_SEQUENCE", "NETSCAPE_CERT_SEQUENCE"));
+mixin(DECLARE_PEM_rw!("NETSCAPE_CERT_SEQUENCE", "NETSCAPE_CERT_SEQUENCE")());
 
-mixin(DECLARE_PEM_rw!("PKCS8", "X509_SIG"));
+mixin(DECLARE_PEM_rw!("PKCS8", "X509_SIG")());
 
-mixin(DECLARE_PEM_rw!("PKCS8_PRIV_KEY_INFO", "PKCS8_PRIV_KEY_INFO"));
+mixin(DECLARE_PEM_rw!("PKCS8_PRIV_KEY_INFO", "PKCS8_PRIV_KEY_INFO")());
 
 version(OPENSSL_NO_RSA) {} else {
-mixin(DECLARE_PEM_rw_cb!("RSAPrivateKey", "RSA"));
+mixin(DECLARE_PEM_rw_cb!("RSAPrivateKey", "RSA")());
 
-mixin(DECLARE_PEM_rw_const!("RSAPublicKey", "RSA"));
-mixin(DECLARE_PEM_rw!("RSA_PUBKEY", "RSA"));
+mixin(DECLARE_PEM_rw_const!("RSAPublicKey", "RSA")());
+mixin(DECLARE_PEM_rw!("RSA_PUBKEY", "RSA")());
 
 }
 
 version(OPENSSL_NO_DSA) {} else {
-mixin(DECLARE_PEM_rw_cb!("DSAPrivateKey", "DSA"));
+mixin(DECLARE_PEM_rw_cb!("DSAPrivateKey", "DSA")());
 
-mixin(DECLARE_PEM_rw!("DSA_PUBKEY", "DSA"));
+mixin(DECLARE_PEM_rw!("DSA_PUBKEY", "DSA")());
 
-mixin(DECLARE_PEM_rw_const!("DSAparams", "DSA"));
+mixin(DECLARE_PEM_rw_const!("DSAparams", "DSA")());
 
 }
 
 version(OPENSSL_NO_EC) {} else {
-mixin(DECLARE_PEM_rw_const!("ECPKParameters", "EC_GROUP"));
-mixin(DECLARE_PEM_rw_cb!("ECPrivateKey", "EC_KEY"));
-mixin(DECLARE_PEM_rw!("EC_PUBKEY", "EC_KEY"));
+mixin(DECLARE_PEM_rw_const!("ECPKParameters", "EC_GROUP")());
+mixin(DECLARE_PEM_rw_cb!("ECPrivateKey", "EC_KEY")());
+mixin(DECLARE_PEM_rw!("EC_PUBKEY", "EC_KEY")());
 }
 
 version(OPENSSL_NO_DH) {} else {
-mixin(DECLARE_PEM_rw_const!("DHparams", "DH"));
+mixin(DECLARE_PEM_rw_const!("DHparams", "DH")());
 
 }
 
-mixin(DECLARE_PEM_rw_cb!("PrivateKey", "EVP_PKEY"));
+mixin(DECLARE_PEM_rw_cb!("PrivateKey", "EVP_PKEY")());
 
-mixin(DECLARE_PEM_rw!("PUBKEY", "EVP_PKEY"));
+mixin(DECLARE_PEM_rw!("PUBKEY", "EVP_PKEY")());
 
 int PEM_write_bio_PKCS8PrivateKey_nid(BIO* bp, EVP_PKEY* x, int nid,
 				  char* kstr, int klen,

deimos/openssl/ssl.d

@@ -1334,7 +1334,7 @@ auto i2d_SSL_SESSION_bio()(BIO* bp,SSL_SESSION** s_id) {
     return ASN1_i2d_bio_of!SSL_SESSION(&i2d_SSL_SESSION,bp,s_id);
 }
 
-mixin(DECLARE_PEM_rw!("SSL_SESSION", "SSL_SESSION"));
+mixin(DECLARE_PEM_rw!("SSL_SESSION", "SSL_SESSION")());
 
 enum SSL_AD_REASON_OFFSET = 1000; /* offset to get SSL_R_... value from SSL_AD_... */