update to the new pikotools api
This commit is contained in:
parent
2025644691
commit
e8ac579fcb
|
@ -5,3 +5,7 @@ data
|
|||
*.o
|
||||
*.a
|
||||
placefinder/placefinder
|
||||
lookup-dir/
|
||||
m
|
||||
.qtcreator/
|
||||
build.sh
|
||||
|
|
18
Makefile
18
Makefile
|
@ -1,20 +1,26 @@
|
|||
|
||||
ifndef CXX
|
||||
CXX = g++
|
||||
endif
|
||||
|
||||
CXX = g++10
|
||||
#CXX = clang++
|
||||
ifndef CXXFLAGS
|
||||
CXXFLAGS = -Wfatal-errors -fPIC -Wall -pedantic -O0 -g3 -pthread -std=c++20 -I../../pikotools/src -I../lib -I/usr/local/include
|
||||
endif
|
||||
|
||||
CXXFLAGS = -Wl,-rpath=/usr/local/lib/gcc10 -Wfatal-errors -fPIC -Wall -pedantic -O0 -g3 -pthread -std=c++20 -I../../pikotools/src -I../lib -I/usr/local/include
|
||||
#CXXFLAGS = -fsanitize=address -Wfatal-errors -fPIC -Wall -pedantic -O0 -g3 -pthread -std=c++20 -I../../pikotools/src -I../lib -I/usr/local/include
|
||||
ifndef LDFLAGS
|
||||
LDFLAGS = -L/usr/local/lib
|
||||
endif
|
||||
|
||||
#-fsanitize=address
|
||||
|
||||
ifndef AR
|
||||
AR = ar
|
||||
endif
|
||||
|
||||
export CXX
|
||||
export CXXFLAGS
|
||||
export LDFLAGS
|
||||
export AR
|
||||
|
||||
|
||||
all: lib placefinder
|
||||
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
*/
|
||||
|
||||
/*
|
||||
* Copyright (c) 2021, Tomasz Sowa
|
||||
* Copyright (c) 2021-2024, Tomasz Sowa
|
||||
* All rights reserved.
|
||||
*
|
||||
* Redistribution and use in source and binary forms, with or without
|
||||
|
@ -288,7 +288,7 @@ bool Finder::parse_way_childs(pt::Space & out, pt::Space & childs)
|
|||
if( ref )
|
||||
{
|
||||
out.add(L"node_id", *ref);
|
||||
long node_id = pt::Tol(ref->c_str());
|
||||
long node_id = pt::to_l(ref->c_str());
|
||||
has_node = get_node(node_id, out);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue