Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-10-01 11:49:47 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove to_nonconst_iterator.h and Refactor

Browse Source 
This was mostly the same as the other commits, but there was actually one reference to
the functions in to_nonconst_iterator.h in http_protocol_handler.inl. All the other
files modified in this commit were to remove extraneous includes of to_nonconst_iterator.h.

In http_protocol_handler.inl, to_nonsonst_iterator() (misspelled?) was used to convert a
string::const_iterator to a nonconst iterator in order to use it in a call to
string::erase(). However, this in not necessary as of C++11, so I removed the conversion
altogether.
This commit is contained in:
Jeffrey 2022-02-11 15:02:45 -06:00
parent dbf8e4a2d6
commit 2499269696
5 changed files with 1 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/epee/include/net/http_client.h
View File

@ -50,7 +50,6 @@
#include "abstract_http_client.h" #include "abstract_http_client.h"
#include "http_base.h" #include "http_base.h"
#include "http_auth.h" #include "http_auth.h"
#include "to_nonconst_iterator.h"
#include "net_parse_helpers.h" #include "net_parse_helpers.h"
#include "syncobj.h" #include "syncobj.h"

1
contrib/epee/include/net/http_protocol_handler.h
View File

@ -33,7 +33,6 @@
#include <boost/optional/optional.hpp> #include <boost/optional/optional.hpp>
#include <string> #include <string>
#include "net_utils_base.h" #include "net_utils_base.h"
#include "to_nonconst_iterator.h"
#include "http_auth.h" #include "http_auth.h"
#include "http_base.h" #include "http_base.h"

2
contrib/epee/include/net/http_protocol_handler.inl
View File

@ -376,7 +376,7 @@ namespace net_utils
m_query_info.m_http_method_str = result[2]; m_query_info.m_http_method_str = result[2];
m_query_info.m_full_request_str = result[0]; m_query_info.m_full_request_str = result[0];
m_cache.erase(m_cache.begin(), to_nonsonst_iterator(m_cache, result[0].second)); m_cache.erase(m_cache.begin(), result[0].second);
m_state = http_state_retriving_header; m_state = http_state_retriving_header;

1
contrib/epee/include/net/munin_connection_handler.h
View File

@ -31,7 +31,6 @@
#include <string> #include <string>
#include "net_utils_base.h" #include "net_utils_base.h"
#include "to_nonconst_iterator.h"
#include "http_base.h" #include "http_base.h"
#include "reg_exp_definer.h" #include "reg_exp_definer.h"

52
contrib/epee/include/to_nonconst_iterator.h
View File

@ -1,52 +0,0 @@
// Copyright (c) 2006-2013, Andrey N. Sabelnikov, www.sabelnikov.net
// All rights reserved.
//
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are met:
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above copyright
// notice, this list of conditions and the following disclaimer in the
// documentation and/or other materials provided with the distribution.
// * Neither the name of the Andrey N. Sabelnikov nor the
// names of its contributors may be used to endorse or promote products
// derived from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
// ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
// WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER BE LIABLE FOR ANY
// DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
// (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
// LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
// ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
#ifndef _TO_NONCONST_ITERATOR_H_
#define _TO_NONCONST_ITERATOR_H_
namespace epee
{
template<class Type>
typename Type::iterator to_nonsonst_iterator(Type& obj, typename Type::const_iterator it)
{
typename Type::difference_type dist = std::distance(static_cast<typename Type::const_iterator>(obj.begin()), it);
typename Type::iterator res_it = obj.begin()+dist;
return res_it;
}
template<class Type>
typename Type::iterator to_nonsonst_iterator(typename Type::iterator base_it, typename Type::const_iterator it)
{
typename Type::difference_type dist = std::distance(static_cast<typename Type::const_iterator>(base_it), it);
typename Type::iterator res_it = base_it+dist;
return res_it;
}
}//namespace epee
#endif //_TO_NONCONST_ITERATOR_H_