From c3f86da17a00787f55e358565a26e20feeb83f3a Mon Sep 17 00:00:00 2001 From: Vinnie Falco Date: Wed, 7 Aug 2013 14:49:18 -0700 Subject: [PATCH] Rename to ripple_asio --- BeastConfig.h | 3 +- Builds/QtCreator/rippled.pro | 2 +- Builds/VisualStudio2012/RippleD.vcxproj | 53 +++++++------- .../VisualStudio2012/RippleD.vcxproj.filters | 70 +++++++++---------- SConstruct | 2 +- modules/ripple_app/ripple_app.h | 2 +- .../boost/ripple_IoService.cpp | 0 .../boost/ripple_IoService.h | 0 .../boost/ripple_SslContext.cpp | 0 .../boost/ripple_SslContext.h | 0 .../ripple_asio.cpp} | 10 +-- .../ripple_asio.h} | 10 +-- .../ripple_asio_fwdecl.h} | 4 +- .../ripple_asio_impl.h} | 6 +- .../tests/ripple_AsioTests.cpp | 0 15 files changed, 78 insertions(+), 84 deletions(-) rename modules/{ripple_basio => ripple_asio}/boost/ripple_IoService.cpp (100%) rename modules/{ripple_basio => ripple_asio}/boost/ripple_IoService.h (100%) rename modules/{ripple_basio => ripple_asio}/boost/ripple_SslContext.cpp (100%) rename modules/{ripple_basio => ripple_asio}/boost/ripple_SslContext.h (100%) rename modules/{ripple_basio/ripple_basio.cpp => ripple_asio/ripple_asio.cpp} (82%) rename modules/{ripple_basio/ripple_basio.h => ripple_asio/ripple_asio.h} (81%) rename modules/{ripple_basio/ripple_basio_fwdecl.h => ripple_asio/ripple_asio_fwdecl.h} (85%) rename modules/{ripple_basio/ripple_basio_impl.h => ripple_asio/ripple_asio_impl.h} (82%) rename modules/{ripple_basio => ripple_asio}/tests/ripple_AsioTests.cpp (100%) diff --git a/BeastConfig.h b/BeastConfig.h index b01d8d6d1b..a1dbf281c9 100644 --- a/BeastConfig.h +++ b/BeastConfig.h @@ -146,7 +146,6 @@ //#define RIPPLE_VERIFY_NODEOBJECT_KEYS 1 #endif - -#define RIPPLE_USES_BEAST_SOCKETS 1 +#define RIPPLE_USES_BEAST_SOCKETS 0 #endif diff --git a/Builds/QtCreator/rippled.pro b/Builds/QtCreator/rippled.pro index be35e5bf47..413567856f 100644 --- a/Builds/QtCreator/rippled.pro +++ b/Builds/QtCreator/rippled.pro @@ -74,8 +74,8 @@ SOURCES += \ ../../modules/ripple_app/ripple_app_pt6.cpp \ ../../modules/ripple_app/ripple_app_pt7.cpp \ ../../modules/ripple_app/ripple_app_pt8.cpp \ + ../../modules/ripple_asio/ripple_asio.cpp \ ../../modules/ripple_basics/ripple_basics.cpp \ - ../../modules/ripple_basio/ripple_basio.cpp \ ../../modules/ripple_core/ripple_core.cpp \ ../../modules/ripple_client/ripple_client.cpp \ ../../modules/ripple_data/ripple_data.cpp \ diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj index ae47f3533f..b0f7086195 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj +++ b/Builds/VisualStudio2012/RippleD.vcxproj @@ -677,6 +677,25 @@ true true + + true + true + true + true + + + true + true + true + true + + + + true + true + true + true + true true @@ -768,30 +787,6 @@ true true - - true - true - true - true - - - true - true - true - true - - - Level4 - Level4 - Level4 - Level4 - - - true - true - true - true - true @@ -1491,6 +1486,11 @@ + + + + + @@ -1517,11 +1517,6 @@ - - - - - diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters index 9642ec31dc..64278d439a 100644 --- a/Builds/VisualStudio2012/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters @@ -94,12 +94,6 @@ {223ac5ce-c9a0-4196-9b75-4f5fbe8bfa00} - - {c6a852db-1174-4bf6-a726-ebaabf595743} - - - {c977169f-d68b-4a59-aa0b-f7d49157d9ac} - {c84fc3af-f487-4eba-af78-d4be009f76d1} @@ -160,8 +154,14 @@ {c69b07a2-44e5-4b06-99a9-81f5d137ea15} - - {271e2469-a2e6-40c6-acc9-aa75cd6e59c3} + + {a8c5d8be-1e90-4e9c-be7f-d2da53920cd4} + + + {f4e4fbf0-3dd2-4413-8318-9d6bc15ada57} + + + {2fdf2a12-4f97-45f6-a63d-7e99e97835dd} @@ -531,12 +531,6 @@ [1] Ripple\ripple_data\protocol - - [1] Ripple\ripple_basio - - - [1] Ripple\ripple_basio\boost - [1] Ripple\ripple_net @@ -555,9 +549,6 @@ [1] Ripple\ripple_net\basics - - [1] Ripple\ripple_basio\boost - [1] Ripple\ripple_app\node @@ -888,12 +879,21 @@ [1] Ripple\ripple_app\main - - [1] Ripple\ripple_basio\tests - [0] Subtrees\beast + + [1] Ripple\ripple_asio + + + [1] Ripple\ripple_asio\tests + + + [1] Ripple\ripple_asio\boost + + + [1] Ripple\ripple_asio\boost + @@ -1319,18 +1319,6 @@ [1] Ripple\ripple_data\protocol - - [1] Ripple\ripple_basio - - - [1] Ripple\ripple_basio - - - [1] Ripple\ripple_basio - - - [1] Ripple\ripple_basio\boost - [1] Ripple\ripple_net @@ -1349,9 +1337,6 @@ [1] Ripple\ripple_net\basics - - [1] Ripple\ripple_basio\boost - [1] Ripple\ripple_app\node @@ -1688,6 +1673,21 @@ [1] Ripple\ripple_app\main + + [1] Ripple\ripple_asio + + + [1] Ripple\ripple_asio + + + [1] Ripple\ripple_asio + + + [1] Ripple\ripple_asio\boost + + + [1] Ripple\ripple_asio\boost + diff --git a/SConstruct b/SConstruct index 783de19e83..0386a050d8 100644 --- a/SConstruct +++ b/SConstruct @@ -133,8 +133,8 @@ COMPILED_FILES = [ 'modules/ripple_app/ripple_app_pt6.cpp', 'modules/ripple_app/ripple_app_pt7.cpp', 'modules/ripple_app/ripple_app_pt8.cpp', + 'modules/ripple_asio/ripple_asio.cpp', 'modules/ripple_basics/ripple_basics.cpp', - 'modules/ripple_basio/ripple_basio.cpp', 'modules/ripple_core/ripple_core.cpp', 'modules/ripple_data/ripple_data.cpp', 'modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp', diff --git a/modules/ripple_app/ripple_app.h b/modules/ripple_app/ripple_app.h index 95f4794ace..2939f97582 100644 --- a/modules/ripple_app/ripple_app.h +++ b/modules/ripple_app/ripple_app.h @@ -22,6 +22,6 @@ #include "modules/ripple_basics/ripple_basics.h" -#include "modules/ripple_basio/ripple_basio.h" +#include "modules/ripple_asio/ripple_asio.h" #endif diff --git a/modules/ripple_basio/boost/ripple_IoService.cpp b/modules/ripple_asio/boost/ripple_IoService.cpp similarity index 100% rename from modules/ripple_basio/boost/ripple_IoService.cpp rename to modules/ripple_asio/boost/ripple_IoService.cpp diff --git a/modules/ripple_basio/boost/ripple_IoService.h b/modules/ripple_asio/boost/ripple_IoService.h similarity index 100% rename from modules/ripple_basio/boost/ripple_IoService.h rename to modules/ripple_asio/boost/ripple_IoService.h diff --git a/modules/ripple_basio/boost/ripple_SslContext.cpp b/modules/ripple_asio/boost/ripple_SslContext.cpp similarity index 100% rename from modules/ripple_basio/boost/ripple_SslContext.cpp rename to modules/ripple_asio/boost/ripple_SslContext.cpp diff --git a/modules/ripple_basio/boost/ripple_SslContext.h b/modules/ripple_asio/boost/ripple_SslContext.h similarity index 100% rename from modules/ripple_basio/boost/ripple_SslContext.h rename to modules/ripple_asio/boost/ripple_SslContext.h diff --git a/modules/ripple_basio/ripple_basio.cpp b/modules/ripple_asio/ripple_asio.cpp similarity index 82% rename from modules/ripple_basio/ripple_basio.cpp rename to modules/ripple_asio/ripple_asio.cpp index 35b32c9c72..cad76571c6 100644 --- a/modules/ripple_basio/ripple_basio.cpp +++ b/modules/ripple_asio/ripple_asio.cpp @@ -4,10 +4,10 @@ */ //============================================================================== -/** Add this to get the @ref ripple_basio module. +/** Add this to get the @ref ripple_asio module. - @file ripple_basio.cpp - @ingroup ripple_basio + @file ripple_asio.cpp + @ingroup ripple_asio */ //------------------------------------------------------------------------------ @@ -17,9 +17,9 @@ #include "beast/modules/beast_basics/beast_basics.h" #include "beast/modules/beast_asio/beast_asio.h" -#include "ripple_basio.h" +#include "ripple_asio.h" -#include "ripple_basio_impl.h" +#include "ripple_asio_impl.h" namespace ripple { diff --git a/modules/ripple_basio/ripple_basio.h b/modules/ripple_asio/ripple_asio.h similarity index 81% rename from modules/ripple_basio/ripple_basio.h rename to modules/ripple_asio/ripple_asio.h index 7e71f339af..acc6798491 100644 --- a/modules/ripple_basio/ripple_basio.h +++ b/modules/ripple_asio/ripple_asio.h @@ -4,14 +4,14 @@ */ //============================================================================== -#ifndef RIPPLE_BASIO_H_INCLUDED -#define RIPPLE_BASIO_H_INCLUDED +#ifndef RIPPLE_ASIO_H_INCLUDED +#define RIPPLE_ASIO_H_INCLUDED #include "beast/modules/beast_core/beast_core.h" // Must be outside the namespace -#include "ripple_basio_fwdecl.h" +#include "ripple_asio_fwdecl.h" /** Abstractions for boost::asio @@ -19,8 +19,8 @@ These classes are designed to move boost::asio header material out of the majority of include paths. - @ingroup ripple_basio - @file ripple_basio.h + @ingroup ripple_asio + @file ripple_asio.h */ namespace ripple { diff --git a/modules/ripple_basio/ripple_basio_fwdecl.h b/modules/ripple_asio/ripple_asio_fwdecl.h similarity index 85% rename from modules/ripple_basio/ripple_basio_fwdecl.h rename to modules/ripple_asio/ripple_asio_fwdecl.h index 9d11bf637c..232d34107b 100644 --- a/modules/ripple_basio/ripple_basio_fwdecl.h +++ b/modules/ripple_asio/ripple_asio_fwdecl.h @@ -4,8 +4,8 @@ */ //============================================================================== -#ifndef RIPPLE_BASIO_FWDECL_H_INCLUDED -#define RIPPLE_BASIO_FWDECL_H_INCLUDED +#ifndef RIPPLE_ASIO_FWDECL_H_INCLUDED +#define RIPPLE_ASIO_FWDECL_H_INCLUDED /** Forward declarations for boost::asio. diff --git a/modules/ripple_basio/ripple_basio_impl.h b/modules/ripple_asio/ripple_asio_impl.h similarity index 82% rename from modules/ripple_basio/ripple_basio_impl.h rename to modules/ripple_asio/ripple_asio_impl.h index e23ddaa9c2..c1d96b7edc 100644 --- a/modules/ripple_basio/ripple_basio_impl.h +++ b/modules/ripple_asio/ripple_asio_impl.h @@ -4,10 +4,10 @@ */ //============================================================================== -#ifndef RIPPLE_BASIO_IMPL_H_INCLUDED -#define RIPPLE_BASIO_IMPL_H_INCLUDED +#ifndef RIPPLE_ASIO_IMPL_H_INCLUDED +#define RIPPLE_ASIO_IMPL_H_INCLUDED -// Once everything is converted, these can be moved to ripple_basio.cpp +// Once everything is converted, these can be moved to ripple_asio.cpp #include #include diff --git a/modules/ripple_basio/tests/ripple_AsioTests.cpp b/modules/ripple_asio/tests/ripple_AsioTests.cpp similarity index 100% rename from modules/ripple_basio/tests/ripple_AsioTests.cpp rename to modules/ripple_asio/tests/ripple_AsioTests.cpp