monero-project/monero
monero-project/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2024-12-23 03:59:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

epee: partially revert c56ee140 to fix linking errors

Browse source 
On Linux Mint 21.3, g++ Ubuntu 11.4.0-1ubuntu1~22.04, I get linking error for an undefined reference to `epee::string_tools::trim_right`. This PR reverts the changes
to epee_readline.cpp in commit c56ee140, which turns a `boost::trim_right` callsite into an `epee::string_tools::trim_right` callsite.
This commit is contained in:
jeffro256 2024-05-28 10:37:42 -05:00
parent cc73fe7116
commit b07a97c51f
No known key found for this signature in database
GPG key ID: 6F79797A6E392442
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)