Disable warnings 4018 and 4244 for VS2012 builds

This commit is contained in:
Vinnie Falco
2013-09-01 09:35:18 -07:00
parent 0f30b55cba
commit 369bd0f36c
10 changed files with 2 additions and 82 deletions

View File

@@ -17,6 +17,7 @@
<AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees;$(RepoDir)\Subtrees\leveldb;$(RepoDir)\Subtrees\leveldb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(RepoDir);$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees;$(RepoDir)\Subtrees\leveldb;$(RepoDir)\Subtrees\leveldb\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions> <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
<ExceptionHandling>Async</ExceptionHandling> <ExceptionHandling>Async</ExceptionHandling>
<DisableSpecificWarnings>4018;4244</DisableSpecificWarnings>
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Shlwapi.lib;%(AdditionalDependencies)</AdditionalDependencies>

View File

@@ -41,16 +41,7 @@ namespace ripple
#include "websocket/WSDoor.cpp" #include "websocket/WSDoor.cpp"
# include "peers/PeerDoor.h" # include "peers/PeerDoor.h"
#include "peers/PeerDoor.cpp" #include "peers/PeerDoor.cpp"
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4244) // conversion, possible loss of data
# pragma warning (disable: 4018) // signed/unsigned mismatch
#endif
#include "main/ripple_Application.cpp" #include "main/ripple_Application.cpp"
#ifdef _MSC_VER
# pragma warning (pop)
#endif
// //
// RippleMain // RippleMain

View File

@@ -20,15 +20,8 @@ namespace ripple
#include "shamap/ripple_SHAMapSyncFilters.cpp" // requires Application #include "shamap/ripple_SHAMapSyncFilters.cpp" // requires Application
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4244) // conversion, possible loss of data
# pragma warning (disable: 4018) // signed/unsigned mismatch
#endif
#include "consensus/ripple_LedgerConsensus.cpp" #include "consensus/ripple_LedgerConsensus.cpp"
#include "ledger/LedgerMaster.cpp" #include "ledger/LedgerMaster.cpp"
#ifdef _MSC_VER
# pragma warning (pop)
#endif
} }

View File

@@ -11,19 +11,9 @@
namespace ripple namespace ripple
{ {
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4244) // conversion, possible loss of data
# pragma warning (disable: 4018) // signed/unsigned mismatch
#endif
#include "ledger/Ledger.cpp" #include "ledger/Ledger.cpp"
#include "node/ripple_NodeStore.cpp" #include "node/ripple_NodeStore.cpp"
#ifdef _MSC_VER
# pragma warning (pop)
#endif
#include "node/ripple_NodeObject.cpp" #include "node/ripple_NodeObject.cpp"
#include "shamap/ripple_SHAMapDelta.cpp" #include "shamap/ripple_SHAMapDelta.cpp"
#include "shamap/ripple_SHAMapNode.cpp" #include "shamap/ripple_SHAMapNode.cpp"
#include "shamap/ripple_SHAMapTreeNode.cpp" #include "shamap/ripple_SHAMapTreeNode.cpp"

View File

@@ -26,15 +26,7 @@ namespace ripple
#include "tx/TransactionMeta.cpp" #include "tx/TransactionMeta.cpp"
#include "tx/Transactor.cpp" #include "tx/Transactor.cpp"
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4244) // conversion, possible loss of data
# pragma warning (disable: 4018) // signed/unsigned mismatch
#endif
#include "peers/ripple_UniqueNodeList.cpp" #include "peers/ripple_UniqueNodeList.cpp"
#include "ledger/ripple_InboundLedger.cpp" #include "ledger/ripple_InboundLedger.cpp"
#ifdef _MSC_VER
# pragma warning (pop)
#endif
} }

View File

@@ -18,16 +18,7 @@ namespace ripple
#include "misc/ripple_Validations.cpp" #include "misc/ripple_Validations.cpp"
#include "tx/OfferCreateTransactor.cpp" #include "tx/OfferCreateTransactor.cpp"
#include "tx/WalletAddTransactor.cpp" #include "tx/WalletAddTransactor.cpp"
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4244) // conversion, possible loss of data
# pragma warning (disable: 4018) // signed/unsigned mismatch
#endif
#include "misc/ripple_FeeVote.cpp" #include "misc/ripple_FeeVote.cpp"
#include "peers/ripple_Peer.cpp" #include "peers/ripple_Peer.cpp"
#ifdef _MSC_VER
# pragma warning (pop)
#endif
} }

View File

@@ -16,16 +16,7 @@ namespace ripple
#include "consensus/ripple_DisputedTx.cpp" #include "consensus/ripple_DisputedTx.cpp"
#include "misc/ripple_HashRouter.cpp" #include "misc/ripple_HashRouter.cpp"
#include "misc/ripple_Offer.cpp" #include "misc/ripple_Offer.cpp"
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4244) // conversion, possible loss of data
# pragma warning (disable: 4018) // signed/unsigned mismatch
#endif
#include "paths/ripple_Pathfinder.cpp" #include "paths/ripple_Pathfinder.cpp"
#include "misc/ripple_Features.cpp" #include "misc/ripple_Features.cpp"
#ifdef _MSC_VER
# pragma warning (pop)
#endif
} }

View File

@@ -15,16 +15,7 @@ namespace ripple
#include "ledger/ripple_LedgerHistory.cpp" #include "ledger/ripple_LedgerHistory.cpp"
#include "misc/ripple_SerializedLedger.cpp" #include "misc/ripple_SerializedLedger.cpp"
#include "tx/ripple_TransactionAcquire.cpp" #include "tx/ripple_TransactionAcquire.cpp"
#ifdef _MSC_VER
# pragma warning (push)
# pragma warning (disable: 4244) // conversion, possible loss of data
# pragma warning (disable: 4018) // signed/unsigned mismatch
#endif
#include "misc/NetworkOPs.cpp" #include "misc/NetworkOPs.cpp"
#include "peers/ripple_Peers.cpp" #include "peers/ripple_Peers.cpp"
#ifdef _MSC_VER
# pragma warning (pop)
#endif
} }

View File

@@ -31,12 +31,6 @@
#endif #endif
#if BEAST_MSVC
#pragma warning (push)
#pragma warning (disable: 4018) // signed/unsigned mismatch
#pragma warning (disable: 4244) // conversion, possible loss of data
#endif
#if BEAST_GCC #if BEAST_GCC
#pragma GCC diagnostic push #pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wreorder" #pragma GCC diagnostic ignored "-Wreorder"
@@ -97,10 +91,6 @@
#endif #endif
#ifdef BEAST_MSVC
#pragma warning (pop)
#endif
#if BEAST_GCC #if BEAST_GCC
#pragma GCC diagnostic pop #pragma GCC diagnostic pop
#endif #endif

View File

@@ -31,12 +31,6 @@
#endif #endif
#if BEAST_MSVC
#pragma warning (push)
#pragma warning (disable: 4018) // signed/unsigned mismatch
#pragma warning (disable: 4244) // conversion, possible loss of data
#endif
#include "leveldb/db/builder.cc" #include "leveldb/db/builder.cc"
#include "leveldb/db/db_impl.cc" #include "leveldb/db/db_impl.cc"
#include "leveldb/db/db_iter.cc" #include "leveldb/db/db_iter.cc"
@@ -89,7 +83,3 @@
# error Missing Android port! # error Missing Android port!
#endif #endif
#ifdef BEAST_MSVC
#pragma warning (pop)
#endif