summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDiusrex <killakan002@hotmail.com>2014-01-06 18:12:40 +0100
committerDiusrex <killakan002@hotmail.com>2014-01-06 18:12:40 +0100
commited9a500d6bd87cef3bb1039c2bdc2ad6d9c9b952 (patch)
treedc4baa3b970050293c00505d86066f0fd794c9bc
parentAdded fake functions into cCriticalSection because of the change to ASSERT (diff)
downloadcuberite-ed9a500d6bd87cef3bb1039c2bdc2ad6d9c9b952.tar
cuberite-ed9a500d6bd87cef3bb1039c2bdc2ad6d9c9b952.tar.gz
cuberite-ed9a500d6bd87cef3bb1039c2bdc2ad6d9c9b952.tar.bz2
cuberite-ed9a500d6bd87cef3bb1039c2bdc2ad6d9c9b952.tar.lz
cuberite-ed9a500d6bd87cef3bb1039c2bdc2ad6d9c9b952.tar.xz
cuberite-ed9a500d6bd87cef3bb1039c2bdc2ad6d9c9b952.tar.zst
cuberite-ed9a500d6bd87cef3bb1039c2bdc2ad6d9c9b952.zip
Diffstat (limited to '')
-rw-r--r--VC2008/CryptoPP.vcproj3
-rw-r--r--lib/cryptopp/cryptlib.cpp10
2 files changed, 2 insertions, 11 deletions
diff --git a/VC2008/CryptoPP.vcproj b/VC2008/CryptoPP.vcproj
index a818e9aa1..f44729d8a 100644
--- a/VC2008/CryptoPP.vcproj
+++ b/VC2008/CryptoPP.vcproj
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="windows-1250"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="9,00"
+ Version="9.00"
Name="CryptoPP"
ProjectGUID="{3423EC9A-52E4-4A4D-9753-EDEBC38785EF}"
RootNamespace="cryptlib"
@@ -60,6 +60,7 @@
WarningLevel="3"
SuppressStartupBanner="true"
DebugInformationFormat="3"
+ DisableSpecificWarnings="4702"
/>
<Tool
Name="VCManagedResourceCompilerTool"
diff --git a/lib/cryptopp/cryptlib.cpp b/lib/cryptopp/cryptlib.cpp
index 661340b8d..df138ddb0 100644
--- a/lib/cryptopp/cryptlib.cpp
+++ b/lib/cryptopp/cryptlib.cpp
@@ -4,12 +4,6 @@
#ifndef CRYPTOPP_IMPORTS
-
-#ifdef _MSC_VER
- #pragma warning(push)
- #pragma warning(disable:4702)
-#endif
-
#include "cryptlib.h"
#include "misc.h"
#include "filters.h"
@@ -831,8 +825,4 @@ void AuthenticatedKeyAgreementDomain::GenerateEphemeralKeyPair(RandomNumberGener
NAMESPACE_END
-#ifdef _MSC_VER
- #pragma warning(pop)
-#endif
-
#endif