mirror of
https://github.com/XRPLF/rippled.git
synced 2026-04-29 15:37:57 +00:00
chore: Bring confidential-devnet to tip of confidential/transfer branch (#6435)
This commit is contained in:
@@ -1,29 +1,9 @@
|
||||
//------------------------------------------------------------------------------
|
||||
/*
|
||||
This file is part of rippled: https://github.com/ripple/rippled
|
||||
Copyright (c) 2012, 2013 Ripple Labs Inc.
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
//==============================================================================
|
||||
|
||||
#ifndef RIPPLE_PROTOCOL_STARRAY_H_INCLUDED
|
||||
#define RIPPLE_PROTOCOL_STARRAY_H_INCLUDED
|
||||
#pragma once
|
||||
|
||||
#include <xrpl/basics/CountedObject.h>
|
||||
#include <xrpl/protocol/STObject.h>
|
||||
|
||||
namespace ripple {
|
||||
namespace xrpl {
|
||||
|
||||
class STArray final : public STBase, public CountedObject<STArray>
|
||||
{
|
||||
@@ -43,16 +23,12 @@ public:
|
||||
|
||||
template <
|
||||
class Iter,
|
||||
class = std::enable_if_t<std::is_convertible_v<
|
||||
typename std::iterator_traits<Iter>::reference,
|
||||
STObject>>>
|
||||
class = std::enable_if_t<std::is_convertible_v<typename std::iterator_traits<Iter>::reference, STObject>>>
|
||||
explicit STArray(Iter first, Iter last);
|
||||
|
||||
template <
|
||||
class Iter,
|
||||
class = std::enable_if_t<std::is_convertible_v<
|
||||
typename std::iterator_traits<Iter>::reference,
|
||||
STObject>>>
|
||||
class = std::enable_if_t<std::is_convertible_v<typename std::iterator_traits<Iter>::reference, STObject>>>
|
||||
STArray(SField const& f, Iter first, Iter last);
|
||||
|
||||
STArray&
|
||||
@@ -172,8 +148,7 @@ STArray::STArray(Iter first, Iter last) : v_(first, last)
|
||||
}
|
||||
|
||||
template <class Iter, class>
|
||||
STArray::STArray(SField const& f, Iter first, Iter last)
|
||||
: STBase(f), v_(first, last)
|
||||
STArray::STArray(SField const& f, Iter first, Iter last) : STBase(f), v_(first, last)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -310,6 +285,4 @@ STArray::erase(const_iterator first, const_iterator last)
|
||||
return v_.erase(first, last);
|
||||
}
|
||||
|
||||
} // namespace ripple
|
||||
|
||||
#endif
|
||||
} // namespace xrpl
|
||||
|
||||
Reference in New Issue
Block a user