From 30aaec60a8c73181f8669dd67a90876242a5738a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=91=D1=8B=D1=87=D0=BA=D0=BE=D0=B2=20=D0=90=D0=BD=D0=B4?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B9?= <andrey@signalmodelling.ru>
Date: Tue, 28 Mar 2017 13:00:57 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@325
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src/core/pistring.cpp | 2 ++
 src/core/pistring.h   | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/core/pistring.cpp b/src/core/pistring.cpp
index 2f6ba602..2b2351ac 100755
--- a/src/core/pistring.cpp
+++ b/src/core/pistring.cpp
@@ -89,8 +89,10 @@ int wctomb(char * c, wchar_t w) {*c = ((char * )&w)[0]; return 1;}
 
 PIString PIString::itos(const int num) {pisprintf("%d", num); return PIString(ch);}
 PIString PIString::ltos(const long num) {pisprintf("%ld", num); return PIString(ch);}
+PIString PIString::lltos(const llong num) {pisprintf("%lld", num); return PIString(ch);}
 PIString PIString::uitos(const uint num) {pisprintf("%u", num); return PIString(ch);}
 PIString PIString::ultos(const ulong num) {pisprintf("%lu", num); return PIString(ch);}
+PIString PIString::ulltos(const ullong num) {pisprintf("%llu", num); return PIString(ch);}
 PIString PIString::ftos(const float num) {pisprintf("%.8f", num); return PIString(ch);}
 PIString PIString::dtos(const double num) {pisprintf("%.8f", num); return PIString(ch);}
 
diff --git a/src/core/pistring.h b/src/core/pistring.h
index 5249b68d..2b76528a 100755
--- a/src/core/pistring.h
+++ b/src/core/pistring.h
@@ -754,15 +754,17 @@ private:
 	
 	static PIString itos(const int num);
 	static PIString ltos(const long num);
+	static PIString lltos(const llong num);
 	static PIString uitos(const uint num);
 	static PIString ultos(const ulong num);
+	static PIString ulltos(const ullong num);
 	static PIString ftos(const float num);
 	static PIString dtos(const double num);
 	static PIString fromNumberBaseS(const llong value, int base = 10, bool * ok = 0) {
 		if (value == 0) return PIString("0");
 		if (base < 2 || base > 40) {if (ok != 0) *ok = false; return PIString();}
 		if (ok != 0) *ok = true;
-		if (base == 10) return itos(value);
+		if (base == 10) return lltos(value);
 		PIString ret;
 		llong v = value < 0 ? -value : value, cn;
 		int b = base;
@@ -780,7 +782,7 @@ private:
 		if (value == 0) return PIString("0");
 		if (base < 2 || base > 40) {if (ok != 0) *ok = false; return PIString();}
 		if (ok != 0) *ok = true;
-		if (base == 10) return itos(value);
+		if (base == 10) return ulltos(value);
 		PIString ret;
 		ullong v = value, cn;
 		int b = base;