diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2024-12-23 11:03:29 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2024-12-23 11:03:29 -0500 |
| commit | d0ba44cc586635a4dda788c0f513d26661250d59 (patch) | |
| tree | 6ff38e6ffefaf881ca5cc1e3e6af226faf27bb82 | |
| parent | ee345b969511e068bde8b2c556105414aeee948b (diff) | |
| parent | 8dfb3661ec4ea4e1d6aeb623506780c08079c348 (diff) | |
| download | monzero-core-d0ba44cc586635a4dda788c0f513d26661250d59.tar.gz monzero-core-d0ba44cc586635a4dda788c0f513d26661250d59.tar.xz monzero-core-d0ba44cc586635a4dda788c0f513d26661250d59.zip | |
Merge pull request #9607
8dfb366 epee: partially revert c56ee140 to fix linking errors (jeffro256)
| -rw-r--r-- | contrib/epee/include/string_tools.h | 2 | ||||
| -rw-r--r-- | contrib/epee/src/readline_buffer.cpp | 3 | ||||
| -rw-r--r-- | contrib/epee/src/string_tools.cpp | 13 |
3 files changed, 1 insertions, 17 deletions
diff --git a/contrib/epee/include/string_tools.h b/contrib/epee/include/string_tools.h index 7de73cbf5..8b26f49ae 100644 --- a/contrib/epee/include/string_tools.h +++ b/contrib/epee/include/string_tools.h @@ -71,8 +71,6 @@ namespace string_tools std::string get_current_module_path(); #endif 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) { diff --git a/contrib/epee/src/readline_buffer.cpp b/contrib/epee/src/readline_buffer.cpp index cefde158c..ac68d1fdb 100644 --- a/contrib/epee/src/readline_buffer.cpp +++ b/contrib/epee/src/readline_buffer.cpp @@ -1,5 +1,4 @@ #include "readline_buffer.h" -#include "string_tools.h" #include <readline/readline.h> #include <readline/history.h> #include <iostream> @@ -174,7 +173,7 @@ static void handle_line(char* line) line_stat = rdln::full; the_line = line; std::string test_line = line; - epee::string_tools::trim_right(test_line); + boost::trim_right(test_line); if(!test_line.empty()) { if (!same_as_last_line(test_line)) diff --git a/contrib/epee/src/string_tools.cpp b/contrib/epee/src/string_tools.cpp index 43f7aca9d..081cb9464 100644 --- a/contrib/epee/src/string_tools.cpp +++ b/contrib/epee/src/string_tools.cpp @@ -174,19 +174,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) { if (s.size() < n) |