Merge branch 'poc-7+'

ethereum · Jan 13, 2015 · c69d0f7 · c69d0f7
2 parents f0158fd + 7775503
commit c69d0f7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/libdevcrypto/CryptoPP.cpp b/libdevcrypto/CryptoPP.cpp
@@ -198,6 +198,9 @@ bool Secp256k1::verifySecret(Secret const& _s, Public& _p)
 
 void Secp256k1::agree(Secret const& _s, Public const& _r, h256& o_s)
 {
+	(void)_s;
+	(void)_r;
+	(void)o_s;
 	ECDH<ECP>::Domain d(m_oid);
 	assert(d.AgreedValueLength() == sizeof(o_s));
 	byte remote[65] = {0x04};

diff --git a/libsolidity/SourceReferenceFormatter.h b/libsolidity/SourceReferenceFormatter.h
@@ -28,7 +28,7 @@
 namespace dev
 {
 
-class Exception; // forward
+struct Exception; // forward
 
 namespace solidity
 {