Skip to content

fix inja std:round error #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
undoubted wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix inja std:round error #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions trunk/user/zerotier/0010-fix-inja-std-round.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
--- a/ext/inja/inja.hpp 2023-03-08 05:51:02
+++ b/ext/inja/inja.hpp 2022-11-04 13:49:13
@@ -25,6 +25,7 @@
#ifndef INCLUDE_INJA_INJA_HPP_
#define INCLUDE_INJA_INJA_HPP_

+#include <stddef.h>
#include <nlohmann/json.hpp>

namespace inja {
@@ -2456,7 +2457,7 @@
case Op::Round: {
const auto args = get_arguments<2>(node);
const int precision = args[1]->get<int>();
- const double result = std::round(args[0]->get<double>() * std::pow(10.0, precision)) / std::pow(10.0, precision);
+ const double result = round(args[0]->get<double>() * std::pow(10.0, precision)) / std::pow(10.0, precision);
if (precision == 0) {
make_result(int(result));
} else {
3 changes: 2 additions & 1 deletion trunk/user/zerotier/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SRC_NAME = ZeroTierOne-1.10.2
SRC_NAME = ZeroTierOne-1.10.4
THISDIR = $(shell pwd)
FLAGS := DEFS=""
CFLAGS := -Os -ffunction-sections -fdata-sections
Expand All @@ -13,6 +13,7 @@ extract_test:
patch -d $(SRC_NAME) -p1 -i ../0002-remove-pie.patch; \
patch -d $(SRC_NAME) -p1 -i ../0007-add-cerrno-header-for-str-errno.patch ; \
patch -d $(SRC_NAME) -p1 -i ../0009-fix-set-mac-and-change-confpath.patch ; \
patch -d $(SRC_NAME) -p1 -i ../0010-fix-inja-std-round.patch ; \
fi ;

config_test:
Expand Down
Binary file removed trunk/user/zerotier/ZeroTierOne-1.10.2.tar.gz
View file
Open in desktop
Binary file not shown.