Skip to content

Commit 43b3a0e

Browse files
fix build error
1 parent 0ae327d commit 43b3a0e

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ add_subdirectory(./keychain_lib)
55
cmake_minimum_required( VERSION 3.0.2 )
66

77
set(CMAKE_CXX_FLAGS "-std=c++14")
8-
set(CMAKE_EXE_LINKER_FLAGS "-lpthread -ldl -v")
8+
set(CMAKE_EXE_LINKER_FLAGS "-ldl -v")
99

1010
SET(BOOST_COMPONENTS)
1111
LIST(APPEND BOOST_COMPONENTS thread date_time system filesystem program_options signals serialization chrono unit_test_framework context locale iostreams)
@@ -28,11 +28,12 @@ find_library(LIB_SECP256 NAME secp256k1 HINTS "./3rd-party-components/lib")
2828
find_library(LIB_GRAPHENE graphene_utilities HINTS "./3rd-party-components/lib")
2929

3030
find_library(LIB_OPENSSL NAME crypto HINTS "/opt/openssllib/lib")
31+
find_library(LIB_PTHREAD NAME pthread HINTS "/usr/lib/x86_64-linux-gnu")
3132

3233
file(GLOB KEYCHAIN_SOURCES "./keychain_cmd_app/*.cpp")
3334
file(GLOB KEYCHAIN_INCLUDE "./keychain_cmd_app/*.hpp")
3435

3536
add_executable(keychain ${KEYCHAIN_SOURCES} ${KEYCHAIN_INCLUDE})
3637

37-
target_link_libraries(keychain keychain_common ${LIB_FC} ${LIB_SECP256} ${LIB_GRAPHENE} ${LIB_OPENSSL} ${Boost_LIBRARIES})
38+
target_link_libraries(keychain keychain_common ${LIB_PTHREAD} ${LIB_FC} ${LIB_SECP256} ${LIB_GRAPHENE} ${LIB_OPENSSL} ${Boost_LIBRARIES})
3839

keychain_lib/include/keychain_lib/pipeline_parser.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class pipeline_parser
3838
using buf_type = std::vector<char>;
3939
using buf_iterator = buf_type::iterator;
4040
using iter_range = std::pair<buf_iterator, buf_iterator>;
41-
iter_range сut_json_obj(buf_iterator parse_begin, buf_iterator parse_end);//return pair(parse_end, parse_end)if no json detached, or pair<m_obj_begin, m_obj_end>
41+
iter_range cut_json_obj(buf_iterator parse_begin, buf_iterator parse_end);//return pair(parse_end, parse_end)if no json detached, or pair<m_obj_begin, m_obj_end>
4242
};
4343

4444
}

keychain_lib/src/pipeline_parser.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ int pipeline_parser::run()
3838
bytes_remaining -= bytes_read;
3939
do
4040
{
41-
auto buf_range = сut_json_obj(read_buf.begin(), it_read_end);
41+
auto buf_range = cut_json_obj(read_buf.begin(), it_read_end);
4242
if( std::distance(buf_range.first, buf_range.second) > 0)
4343
{
4444
try {
@@ -66,7 +66,7 @@ int pipeline_parser::run()
6666
return 0;
6767
}
6868

69-
pipeline_parser::iter_range pipeline_parser::сut_json_obj(pipeline_parser::buf_iterator parse_begin, pipeline_parser::buf_iterator parse_end)
69+
pipeline_parser::iter_range pipeline_parser::cut_json_obj(pipeline_parser::buf_iterator parse_begin, pipeline_parser::buf_iterator parse_end)
7070
{
7171
size_t brace_count = 0;
7272
auto start_obj = parse_end;

0 commit comments

Comments
 (0)