From 124c28b0eb1a59193c665af9dec797491746d70a Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Mon, 10 Jun 2013 17:11:10 -0700 Subject: [PATCH] Enable SEH exception handling in the VS2012 project --- RippleD.props | 1 + modules/ripple_data/protocol/ripple_RippleAddress.cpp | 9 ++------- modules/ripple_main/ripple_main.cpp | 4 ++++ src/cpp/ripple/Application.h | 4 ++-- src/cpp/ripple/CallRPC.cpp | 1 - src/cpp/ripple/NetworkOPs.cpp | 6 ------ src/cpp/ripple/Pathfinder.cpp | 8 -------- src/cpp/ripple/PeerDoor.cpp | 9 --------- src/cpp/ripple/RPCDoor.cpp | 1 - src/cpp/ripple/RPCHandler.cpp | 1 - src/cpp/ripple/RPCSub.cpp | 1 - src/cpp/ripple/WSConnection.h | 1 - src/cpp/ripple/WSDoor.cpp | 1 - src/cpp/ripple/WSHandler.h | 2 -- src/cpp/ripple/main.cpp | 11 ----------- src/cpp/ripple/ripple_LoadFeeTrack.cpp | 4 ---- src/cpp/ripple/ripple_Validations.cpp | 5 ----- 17 files changed, 9 insertions(+), 60 deletions(-) diff --git a/RippleD.props b/RippleD.props index 4d5516806b..79a7139809 100644 --- a/RippleD.props +++ b/RippleD.props @@ -17,6 +17,7 @@ Level3 $(RepoDir);$(RepoDir)\src\cpp\leveldb;$(RepoDir)\src\cpp\leveldb\include;$(RepoDir)\src\cpp\protobuf\src;$(RepoDir)\src\cpp\protobuf\vsprojects;$(RepoDir)\build\proto;$(RepoDir)\Subtrees\beast;%(AdditionalIncludeDirectories) /bigobj %(AdditionalOptions) + Async Shlwapi.lib;%(AdditionalDependencies) diff --git a/modules/ripple_data/protocol/ripple_RippleAddress.cpp b/modules/ripple_data/protocol/ripple_RippleAddress.cpp index 924be45a4c..a935734c11 100644 --- a/modules/ripple_data/protocol/ripple_RippleAddress.cpp +++ b/modules/ripple_data/protocol/ripple_RippleAddress.cpp @@ -1,13 +1,8 @@ - -// VFALCO TODO remove this when it's safe to do so. -#ifdef __APPLICATION__ -#error Including Application.h is disallowed! -#endif - SETUP_LOG (RippleAddress) -RippleAddress::RippleAddress() : mIsValid(false) +RippleAddress::RippleAddress () + : mIsValid (false) { nVersion = VER_NONE; } diff --git a/modules/ripple_main/ripple_main.cpp b/modules/ripple_main/ripple_main.cpp index e5f7836b93..1687d36a90 100644 --- a/modules/ripple_main/ripple_main.cpp +++ b/modules/ripple_main/ripple_main.cpp @@ -34,6 +34,7 @@ #include #include #include +#include #include #include #include @@ -55,11 +56,14 @@ #include #include #include +#include #include +#include #include #include #include #include +#include #include #include #include diff --git a/src/cpp/ripple/Application.h b/src/cpp/ripple/Application.h index 1ae29dd667..0e8080ad8e 100644 --- a/src/cpp/ripple/Application.h +++ b/src/cpp/ripple/Application.h @@ -1,5 +1,5 @@ -#ifndef __APPLICATION__ -#define __APPLICATION__ +#ifndef RIPPLE_APPLICATION_H +#define RIPPLE_APPLICATION_H // VFALCO TODO Fix forward declares required for header dependency loops class IFeatures; diff --git a/src/cpp/ripple/CallRPC.cpp b/src/cpp/ripple/CallRPC.cpp index 13c29361e6..958933fbda 100644 --- a/src/cpp/ripple/CallRPC.cpp +++ b/src/cpp/ripple/CallRPC.cpp @@ -20,7 +20,6 @@ #include #include -#include "Application.h" #include "RPC.h" #include "RPCErr.h" diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp index bdf5cc3cf5..19fb28ef4e 100644 --- a/src/cpp/ripple/NetworkOPs.cpp +++ b/src/cpp/ripple/NetworkOPs.cpp @@ -1,10 +1,4 @@ -#include "Application.h" -#include "Transaction.h" -#include "HashPrefixes.h" -#include "LedgerConsensus.h" -#include "LedgerTiming.h" - SETUP_LOG (NetworkOPs) // This is the primary interface into the "client" portion of the program. diff --git a/src/cpp/ripple/Pathfinder.cpp b/src/cpp/ripple/Pathfinder.cpp index 8db36b2289..a6d7a539b4 100644 --- a/src/cpp/ripple/Pathfinder.cpp +++ b/src/cpp/ripple/Pathfinder.cpp @@ -1,12 +1,4 @@ -#include "Pathfinder.h" - -#include - -#include - -#include "Application.h" - SETUP_LOG (Pathfinder) /* diff --git a/src/cpp/ripple/PeerDoor.cpp b/src/cpp/ripple/PeerDoor.cpp index 352a5c828c..5472c06fc4 100644 --- a/src/cpp/ripple/PeerDoor.cpp +++ b/src/cpp/ripple/PeerDoor.cpp @@ -1,13 +1,4 @@ -#include "PeerDoor.h" - -#include - -#include -#include - -#include "Application.h" - SETUP_LOG (PeerDoor) using namespace std; diff --git a/src/cpp/ripple/RPCDoor.cpp b/src/cpp/ripple/RPCDoor.cpp index b2df802f65..9033681e51 100644 --- a/src/cpp/ripple/RPCDoor.cpp +++ b/src/cpp/ripple/RPCDoor.cpp @@ -1,5 +1,4 @@ #include "RPCDoor.h" -#include "Application.h" #include #include diff --git a/src/cpp/ripple/RPCHandler.cpp b/src/cpp/ripple/RPCHandler.cpp index 16f2db0886..d502e800a8 100644 --- a/src/cpp/ripple/RPCHandler.cpp +++ b/src/cpp/ripple/RPCHandler.cpp @@ -11,7 +11,6 @@ #include "Pathfinder.h" #include "RPCHandler.h" #include "RPCSub.h" -#include "Application.h" #include "AccountItems.h" #include "Wallet.h" #include "RippleCalc.h" diff --git a/src/cpp/ripple/RPCSub.cpp b/src/cpp/ripple/RPCSub.cpp index 6028eda30b..a6c9e20074 100644 --- a/src/cpp/ripple/RPCSub.cpp +++ b/src/cpp/ripple/RPCSub.cpp @@ -1,6 +1,5 @@ #include -#include "Application.h" #include "RPCSub.h" #include "CallRPC.h" diff --git a/src/cpp/ripple/WSConnection.h b/src/cpp/ripple/WSConnection.h index d19cc95bfd..45251bfc8b 100644 --- a/src/cpp/ripple/WSConnection.h +++ b/src/cpp/ripple/WSConnection.h @@ -11,7 +11,6 @@ #include #include "WSDoor.h" -#include "Application.h" #include "CallRPC.h" #include "LoadManager.h" #include "RPCErr.h" diff --git a/src/cpp/ripple/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp index fac356c159..85a3f3fde7 100644 --- a/src/cpp/ripple/WSDoor.cpp +++ b/src/cpp/ripple/WSDoor.cpp @@ -4,7 +4,6 @@ //#include "../websocketpp/src/sockets/autotls.hpp" //#include "../websocketpp/src/websocketpp.hpp" -#include "Application.h" #include "WSConnection.h" #include "WSHandler.h" diff --git a/src/cpp/ripple/WSHandler.h b/src/cpp/ripple/WSHandler.h index 4e0de4cfb9..17fdad72bd 100644 --- a/src/cpp/ripple/WSHandler.h +++ b/src/cpp/ripple/WSHandler.h @@ -1,8 +1,6 @@ #ifndef __WSHANDLER__ #define __WSHANDLER__ -#include "Application.h" - extern void initSSLContext(boost::asio::ssl::context& context, std::string key_file, std::string cert_file, std::string chain_file); diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp index db76538db8..fd6d197866 100644 --- a/src/cpp/ripple/main.cpp +++ b/src/cpp/ripple/main.cpp @@ -1,15 +1,4 @@ -#include - -#include -#include -#include -#include - -#include "Application.h" -#include "CallRPC.h" -#include "RPCHandler.h" - namespace po = boost::program_options; // VFALCO TODO make these singletons that initialize statically diff --git a/src/cpp/ripple/ripple_LoadFeeTrack.cpp b/src/cpp/ripple/ripple_LoadFeeTrack.cpp index 374ce5214e..fecf9f409b 100644 --- a/src/cpp/ripple/ripple_LoadFeeTrack.cpp +++ b/src/cpp/ripple/ripple_LoadFeeTrack.cpp @@ -1,7 +1,3 @@ -//#include -//#include -//#include -//#include "Application.h" class LoadFeeTrack : public ILoadFeeTrack { diff --git a/src/cpp/ripple/ripple_Validations.cpp b/src/cpp/ripple/ripple_Validations.cpp index 1784847e3e..4b2924d788 100644 --- a/src/cpp/ripple/ripple_Validations.cpp +++ b/src/cpp/ripple/ripple_Validations.cpp @@ -1,9 +1,4 @@ -#include - -#include "Application.h" -#include "LedgerTiming.h" - class Validations; SETUP_LOG (Validations)