flewkey
/
cuberite-2a
1
0
Fork 0
Code Releases Activity

Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.h 

I also added a warning(push)/(pop) around crpytlib.cpp because it would go crazy with warnings.

So now, the only warning from cryptopp that is not blocked is 'unreferenced local function has been removed', which also occurs at a single function.
This commit is contained in:
Diusrex 2014-01-05 15:06:17 -07:00
parent 0d5b581fcd
commit 2dbe5033ca
6 changed files with 78 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cryptopp/cryptlib.cpp
View File

@ -4,6 +4,12 @@
#ifndef CRYPTOPP_IMPORTS
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4702)
#endif
#include "cryptlib.h"
#include "misc.h"
#include "filters.h"
@ -825,4 +831,8 @@ void AuthenticatedKeyAgreementDomain::GenerateEphemeralKeyPair(RandomNumberGener
NAMESPACE_END
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#endif

13
src/Protocol/Protocol132.cpp
View File

@ -5,7 +5,6 @@
#include "Globals.h"
#include "ChunkDataSerializer.h"
#include "cryptopp/randpool.h"
#include "Protocol132.h"
#include "../Root.h"
#include "../Server.h"
@ -19,8 +18,20 @@
#include "../WorldStorage/FastNBT.h"
#include "../StringCompression.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4127)
#pragma warning(disable:4244)
#pragma warning(disable:4231)
#pragma warning(disable:4189)
#pragma warning(disable:4702)
#endif
#include "cryptopp/randpool.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#define HANDLE_PACKET_READ(Proc, Type, Var) \

14
src/Protocol/Protocol132.h
View File

@ -10,9 +10,23 @@
#pragma once
#include "Protocol125.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4127)
#pragma warning(disable:4244)
#pragma warning(disable:4231)
#pragma warning(disable:4189)
#pragma warning(disable:4702)
#endif
#include "cryptopp/modes.h"
#include "cryptopp/aes.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif

13
src/Protocol/Protocol14x.cpp
View File

@ -16,7 +16,6 @@ Implements the 1.4.x protocol classes representing these protocols:
#include "../Root.h"
#include "../Server.h"
#include "../ClientHandle.h"
#include "cryptopp/randpool.h"
#include "../Item.h"
#include "ChunkDataSerializer.h"
#include "../Entities/Player.h"
@ -25,8 +24,20 @@ Implements the 1.4.x protocol classes representing these protocols:
#include "../Entities/Pickup.h"
#include "../Entities/FallingBlock.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4127)
#pragma warning(disable:4244)
#pragma warning(disable:4231)
#pragma warning(disable:4189)
#pragma warning(disable:4702)
#endif
#include "cryptopp/randpool.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif
#define HANDLE_PACKET_READ(Proc, Type, Var) \

14
src/Protocol/Protocol17x.h
View File

@ -16,9 +16,23 @@ Declares the 1.7.x protocol classes:
#include "Protocol.h"
#include "../ByteBuffer.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4127)
#pragma warning(disable:4244)
#pragma warning(disable:4231)
#pragma warning(disable:4189)
#pragma warning(disable:4702)
#endif
#include "cryptopp/modes.h"
#include "cryptopp/aes.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif

17
src/Server.h
View File

@ -11,9 +11,24 @@
#include "OSSupport/SocketThreads.h"
#include "OSSupport/ListenThread.h"
#include "RCONServer.h"
#ifdef _MSC_VER
#pragma warning(push)
#pragma warning(disable:4127)
#pragma warning(disable:4244)
#pragma warning(disable:4231)
#pragma warning(disable:4189)
#pragma warning(disable:4702)
#endif
#include "cryptopp/rsa.h"
#include "cryptopp/randpool.h"
#include "RCONServer.h"
#ifdef _MSC_VER
#pragma warning(pop)
#endif