Change typedef to using.

Conflicts:
	src/ripple/app/TODO.md
	src/ripple/app/ledger/Ledger.h
	src/ripple/protocol/Protocol.h
This commit is contained in:
Howard Hinnant
2015-05-21 19:12:10 -04:00
committed by Vinnie Falco
parent 52f298f150
commit 155fcdbcd0
224 changed files with 790 additions and 844 deletions

View File

@@ -40,7 +40,7 @@ template < typename AllocatedType
class BatchAllocator
{
public:
typedef AllocatedType Type;
using Type = AllocatedType;
BatchAllocator ( unsigned int objectsPerPage = 255 )
: freeHead_ ( 0 )

View File

@@ -24,8 +24,8 @@ namespace Json
{
// value.h
typedef int Int;
typedef unsigned int UInt;
using Int = int;
using UInt = unsigned int;
class StaticString;
class Value;
class ValueIteratorBase;

View File

@@ -36,8 +36,8 @@ namespace Json
class Reader
{
public:
typedef char Char;
typedef const Char* Location;
using Char = char;
using Location = const Char*;
/** \brief Constructs a Reader allowing all features
* for parsing.
@@ -107,7 +107,7 @@ private:
Location extra_;
};
typedef std::deque<ErrorInfo> Errors;
using Errors = std::deque<ErrorInfo>;
bool expectToken ( TokenType type, Token& token, const char* message );
bool readToken ( Token& token );
@@ -150,7 +150,7 @@ private:
std::string getLocationLineAndColumn ( Location location ) const;
void skipCommentTokens ( Token& token );
typedef std::stack<Value*> Nodes;
using Nodes = std::stack<Value*>;
Nodes nodes_;
Errors errors_;
std::string document_;

View File

@@ -141,12 +141,12 @@ class Value
friend class ValueIteratorBase;
public:
typedef std::vector<std::string> Members;
typedef ValueIterator iterator;
typedef ValueConstIterator const_iterator;
typedef Json::UInt UInt;
typedef Json::Int Int;
typedef UInt ArrayIndex;
using Members = std::vector<std::string>;
using iterator = ValueIterator;
using const_iterator = ValueConstIterator;
using UInt = Json::UInt;
using Int = Json::Int;
using ArrayIndex = UInt;
static const Value null;
static const Int minInt;
@@ -180,7 +180,7 @@ private:
};
public:
typedef std::map<CZString, Value> ObjectValues;
using ObjectValues = std::map<CZString, Value>;
public:
/** \brief Create a default Value of the given type.
@@ -414,9 +414,9 @@ public:
class ValueIteratorBase
{
public:
typedef unsigned int size_t;
typedef int difference_type;
typedef ValueIteratorBase SelfType;
using size_t = unsigned int;
using difference_type = int;
using SelfType = ValueIteratorBase;
ValueIteratorBase ();
@@ -472,11 +472,11 @@ class ValueConstIterator : public ValueIteratorBase
{
friend class Value;
public:
typedef unsigned int size_t;
typedef int difference_type;
typedef const Value& reference;
typedef const Value* pointer;
typedef ValueConstIterator SelfType;
using size_t = unsigned int;
using difference_type = int;
using reference = const Value&;
using pointer = const Value*;
using SelfType = ValueConstIterator;
ValueConstIterator ();
private:
@@ -525,11 +525,11 @@ class ValueIterator : public ValueIteratorBase
{
friend class Value;
public:
typedef unsigned int size_t;
typedef int difference_type;
typedef Value& reference;
typedef Value* pointer;
typedef ValueIterator SelfType;
using size_t = unsigned int;
using difference_type = int;
using reference = Value&;
using pointer = Value*;
using SelfType = ValueIterator;
ValueIterator ();
ValueIterator ( const ValueConstIterator& other );

View File

@@ -101,7 +101,7 @@ private:
void indent ();
void unindent ();
typedef std::vector<std::string> ChildValues;
using ChildValues = std::vector<std::string>;
ChildValues childValues_;
std::string document_;
@@ -155,7 +155,7 @@ private:
void indent ();
void unindent ();
typedef std::vector<std::string> ChildValues;
using ChildValues = std::vector<std::string>;
ChildValues childValues_;
std::ostream* document_;