diff options
| author | Tycho <work.tycho+git@gmail.com> | 2014-01-07 13:57:34 +0100 |
|---|---|---|
| committer | Tycho <work.tycho+git@gmail.com> | 2014-01-07 13:57:34 +0100 |
| commit | 0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f (patch) | |
| tree | d2593b129bf0e83d72937cf52e8a9283c85be46a /src/Protocol/Protocol14x.cpp | |
| parent | Merge branch 'master' of github.com:mc-server/MCServer (diff) | |
| parent | Added Base64Encode(). (diff) | |
| download | cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.gz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.bz2 cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.lz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.xz cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.tar.zst cuberite-0b79ad0d5dd9d2ddcbff4f7351ebd83ce22fb53f.zip | |
Diffstat (limited to 'src/Protocol/Protocol14x.cpp')
| -rw-r--r-- | src/Protocol/Protocol14x.cpp | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/src/Protocol/Protocol14x.cpp b/src/Protocol/Protocol14x.cpp index 28122034c..926fe6ee8 100644 --- a/src/Protocol/Protocol14x.cpp +++ b/src/Protocol/Protocol14x.cpp @@ -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) \ |