From 48809d4e85c125814425c621d8d0d89f95405924 Mon Sep 17 00:00:00 2001
From: Jeffrey Walton <noloader@gmail.com>
Date: Thu, 5 Nov 2015 01:59:46 -0500
Subject: CRYPTOPP 5.6.3 RC6 checkin

---
 adhoc.cpp.proto | 43 +++++++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'adhoc.cpp.proto')

diff --git a/adhoc.cpp.proto b/adhoc.cpp.proto
index cdc0a3b3..ffe8e3b8 100644
--- a/adhoc.cpp.proto
+++ b/adhoc.cpp.proto
@@ -1,20 +1,23 @@
-#include "cryptlib.h"
-#include "stdcpp.h"
-#include "misc.h"
-
-USING_NAMESPACE(CryptoPP)
-
-#if GCC_DIAGNOSTIC_AWARE
-# pragma GCC diagnostic push
-# pragma GCC diagnostic ignored "-Wunused-variable"
-# pragma GCC diagnostic ignored "-Wunused-parameter"
-#endif
-
-extern int (*AdhocTest)(int argc, char *argv[]);
-
-int MyAdhocTest(int argc, char *argv[])
-{
-	return 0;
-}
-
-static int s_i = (AdhocTest = &MyAdhocTest, 0);
+#include "config.h"
+#include <iosfwd>
+
+#if CRYPTOPP_MSC_VERSION
+# pragma warning(disable: 4100 4189 4996)
+#endif
+
+#if CRYPTOPP_GCC_DIAGNOSTIC_AVAILABLE
+# pragma GCC diagnostic ignored "-Wunused-variable"
+#endif
+
+USING_NAMESPACE(CryptoPP)
+USING_NAMESPACE(std)
+
+extern int (*AdhocTest)(int argc, char *argv[]);
+
+int MyAdhocTest(int argc, char *argv[])
+{
+	CRYPTOPP_UNUSED(argc), CRYPTOPP_UNUSED(argv);
+	return 0;
+}
+
+static int s_i = (AdhocTest = &MyAdhocTest, 0);
-- 
cgit v1.2.1