diff --git a/Builds/VisualStudio2012/RippleD.props b/Builds/VisualStudio2012/RippleD.props
index 50c967322..8f183956c 100644
--- a/Builds/VisualStudio2012/RippleD.props
+++ b/Builds/VisualStudio2012/RippleD.props
@@ -17,6 +17,7 @@
$(RepoDir);$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees;$(RepoDir)\Subtrees\leveldb;$(RepoDir)\Subtrees\leveldb\include;%(AdditionalIncludeDirectories)
/bigobj %(AdditionalOptions)
Async
+ 4018;4244
Shlwapi.lib;%(AdditionalDependencies)
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index d79d26653..2b7cb3a41 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -41,16 +41,7 @@ namespace ripple
#include "websocket/WSDoor.cpp"
# include "peers/PeerDoor.h"
#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"
-#ifdef _MSC_VER
-# pragma warning (pop)
-#endif
//
// RippleMain
diff --git a/modules/ripple_app/ripple_app_pt1.cpp b/modules/ripple_app/ripple_app_pt1.cpp
index bb1b75088..33be255cd 100644
--- a/modules/ripple_app/ripple_app_pt1.cpp
+++ b/modules/ripple_app/ripple_app_pt1.cpp
@@ -20,15 +20,8 @@ namespace ripple
#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 "ledger/LedgerMaster.cpp"
-#ifdef _MSC_VER
-# pragma warning (pop)
-#endif
}
diff --git a/modules/ripple_app/ripple_app_pt3.cpp b/modules/ripple_app/ripple_app_pt3.cpp
index 5fc2720fb..8845618aa 100644
--- a/modules/ripple_app/ripple_app_pt3.cpp
+++ b/modules/ripple_app/ripple_app_pt3.cpp
@@ -11,19 +11,9 @@
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 "node/ripple_NodeStore.cpp"
-#ifdef _MSC_VER
-# pragma warning (pop)
-#endif
-
#include "node/ripple_NodeObject.cpp"
-
#include "shamap/ripple_SHAMapDelta.cpp"
#include "shamap/ripple_SHAMapNode.cpp"
#include "shamap/ripple_SHAMapTreeNode.cpp"
diff --git a/modules/ripple_app/ripple_app_pt4.cpp b/modules/ripple_app/ripple_app_pt4.cpp
index 47b4ba5d1..ecc29b4cc 100644
--- a/modules/ripple_app/ripple_app_pt4.cpp
+++ b/modules/ripple_app/ripple_app_pt4.cpp
@@ -26,15 +26,7 @@ namespace ripple
#include "tx/TransactionMeta.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 "ledger/ripple_InboundLedger.cpp"
-#ifdef _MSC_VER
-# pragma warning (pop)
-#endif
}
diff --git a/modules/ripple_app/ripple_app_pt5.cpp b/modules/ripple_app/ripple_app_pt5.cpp
index 90e6f7751..eb09a8170 100644
--- a/modules/ripple_app/ripple_app_pt5.cpp
+++ b/modules/ripple_app/ripple_app_pt5.cpp
@@ -18,16 +18,7 @@ namespace ripple
#include "misc/ripple_Validations.cpp"
#include "tx/OfferCreateTransactor.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 "peers/ripple_Peer.cpp"
-#ifdef _MSC_VER
-# pragma warning (pop)
-#endif
}
diff --git a/modules/ripple_app/ripple_app_pt6.cpp b/modules/ripple_app/ripple_app_pt6.cpp
index df530cd30..5aa593c7a 100644
--- a/modules/ripple_app/ripple_app_pt6.cpp
+++ b/modules/ripple_app/ripple_app_pt6.cpp
@@ -16,16 +16,7 @@ namespace ripple
#include "consensus/ripple_DisputedTx.cpp"
#include "misc/ripple_HashRouter.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 "misc/ripple_Features.cpp"
-#ifdef _MSC_VER
-# pragma warning (pop)
-#endif
}
diff --git a/modules/ripple_app/ripple_app_pt7.cpp b/modules/ripple_app/ripple_app_pt7.cpp
index e6154c7c5..2d9f6d18f 100644
--- a/modules/ripple_app/ripple_app_pt7.cpp
+++ b/modules/ripple_app/ripple_app_pt7.cpp
@@ -15,16 +15,7 @@ namespace ripple
#include "ledger/ripple_LedgerHistory.cpp"
#include "misc/ripple_SerializedLedger.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 "peers/ripple_Peers.cpp"
-#ifdef _MSC_VER
-# pragma warning (pop)
-#endif
}
diff --git a/modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp b/modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp
index 12a4ae818..5420c58aa 100644
--- a/modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp
+++ b/modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp
@@ -31,12 +31,6 @@
#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
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wreorder"
@@ -97,10 +91,6 @@
#endif
-#ifdef BEAST_MSVC
-#pragma warning (pop)
-#endif
-
#if BEAST_GCC
#pragma GCC diagnostic pop
#endif
diff --git a/modules/ripple_leveldb/ripple_leveldb.cpp b/modules/ripple_leveldb/ripple_leveldb.cpp
index abc46ef9f..c0fefa0e8 100644
--- a/modules/ripple_leveldb/ripple_leveldb.cpp
+++ b/modules/ripple_leveldb/ripple_leveldb.cpp
@@ -31,12 +31,6 @@
#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/db_impl.cc"
#include "leveldb/db/db_iter.cc"
@@ -89,7 +83,3 @@
# error Missing Android port!
#endif
-
-#ifdef BEAST_MSVC
-#pragma warning (pop)
-#endif