update to the new pikotools api

This commit is contained in:
Tomasz Sowa 2024-04-03 17:03:50 +02:00
parent 2025644691
commit e8ac579fcb
No known key found for this signature in database
GPG Key ID: 58A472D1C9399FED
3 changed files with 18 additions and 8 deletions

4
.gitignore vendored
View File

@ -5,3 +5,7 @@ data
*.o *.o
*.a *.a
placefinder/placefinder placefinder/placefinder
lookup-dir/
m
.qtcreator/
build.sh

View File

@ -1,20 +1,26 @@
ifndef CXX
CXX = g++
endif
CXX = g++10 ifndef CXXFLAGS
#CXX = clang++ 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 ifndef LDFLAGS
#CXXFLAGS = -fsanitize=address -Wfatal-errors -fPIC -Wall -pedantic -O0 -g3 -pthread -std=c++20 -I../../pikotools/src -I../lib -I/usr/local/include
LDFLAGS = -L/usr/local/lib LDFLAGS = -L/usr/local/lib
endif
#-fsanitize=address ifndef AR
AR = ar
endif
export CXX export CXX
export CXXFLAGS export CXXFLAGS
export LDFLAGS export LDFLAGS
export AR export AR
all: lib placefinder all: lib placefinder

View File

@ -5,7 +5,7 @@
*/ */
/* /*
* Copyright (c) 2021, Tomasz Sowa * Copyright (c) 2021-2024, Tomasz Sowa
* All rights reserved. * All rights reserved.
* *
* Redistribution and use in source and binary forms, with or without * 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 ) if( ref )
{ {
out.add(L"node_id", *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); has_node = get_node(node_id, out);
} }
} }