Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9342 

b07a97c epee: partially revert c56ee140 to fix linking errors (jeffro256)
This commit is contained in:
luigi1111 2024-07-16 18:44:04 -04:00
parent 040bccc22f b07a97c51f
commit b02bf31b83
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010
3 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/epee/include/string_tools.h
View File

@ -71,8 +71,6 @@ namespace string_tools
std::string get_current_module_path(); std::string get_current_module_path();
#endif #endif
void set_module_name_and_folder(const std::string& path_to_process_); void set_module_name_and_folder(const std::string& path_to_process_);
void trim_left(std::string& str);
void trim_right(std::string& str);
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
inline std::string& trim(std::string& str) inline std::string& trim(std::string& str)
{ {

3
contrib/epee/src/readline_buffer.cpp
View File

@ -1,5 +1,4 @@
#include "readline_buffer.h" #include "readline_buffer.h"
#include "string_tools.h"
#include <readline/readline.h> #include <readline/readline.h>
#include <readline/history.h> #include <readline/history.h>
#include <iostream> #include <iostream>
@ -174,7 +173,7 @@ static void handle_line(char* line)
line_stat = rdln::full; line_stat = rdln::full;
the_line = line; the_line = line;
std::string test_line = line; std::string test_line = line;
epee::string_tools::trim_right(test_line); boost::trim_right(test_line);
if(!test_line.empty()) if(!test_line.empty())
{ {
if (!same_as_last_line(test_line)) if (!same_as_last_line(test_line))

13
contrib/epee/src/string_tools.cpp
View File

@ -164,19 +164,6 @@ namespace string_tools
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void trim_left(std::string& str)
{
boost::trim_left(str);
return;
}
//----------------------------------------------------------------------------
void trim_right(std::string& str)
{
boost::trim_right(str);
return;
}
std::string pad_string(std::string s, size_t n, char c, bool prepend) std::string pad_string(std::string s, size_t n, char c, bool prepend)
{ {
if (s.size() < n) if (s.size() < n)