git-svn-id: svn://db.shs.com.ru/pip@333 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

main.cpp

@@ -32,13 +32,24 @@ const char pult_config[] =
 		";
 */
 #include "pifft.h"
+int asize(ssize_t s, size_t pid_rsize) {
+	if (s <= 0) return 0;
+	if (pid_rsize + pid_rsize >= size_t(s) && pid_rsize < size_t(s))
+		return pid_rsize + pid_rsize;
+	ssize_t t = 0, s_ = ssize_t(s) - 1;
+	while (s_ >> t) ++t;
+	return (1 << t);
+}
 int main(int argc, char *argv[]) {
-	PIFFTWf fft;
+	/*PIFFTWf fft;
 	PIVector<float> in;
 	for (int i = 0; i < 32; ++i)
 		in << i%10;
 	PIVector<complexf> out = fft.calcFFT(in);
-	piCout << out;
+	piCout << out;*/
+	for (int i = 0; i < 16; ++i) {
+		piCout << asize(i, 100);
+	}
 	return 0;
 	/*__S__ s, s1;
 	s.text = "123";

src/containers/pideque.h

@@ -335,7 +335,7 @@ private:
 		if (s <= 0) return 0;
 		if (pid_rsize + pid_rsize >= size_t(s) && pid_rsize < size_t(s))
 			return pid_rsize + pid_rsize;
-		size_t t = 0, s_ = size_t(s) - 1;
+		ssize_t t = 0, s_ = s - 1;
 		while (s_ >> t) ++t;
 		return (1 << t);
 	}

src/containers/pivector.h

@@ -304,7 +304,7 @@ private:
 		if (s == 0) return 0;
 		if (piv_rsize + piv_rsize >= s && piv_rsize < s)
 			return piv_rsize + piv_rsize;
-		size_t t = 0, s_ = s - 1;
+		ssize_t t = 0, s_ = s - 1;
 		while (s_ >> t) ++t;
 		return (1 << t);
 	}

src/core/piinit.cpp

@@ -111,7 +111,7 @@ PIInit::PIInit() {
 	DWORD dwVersion = GetVersion();
 	DWORD dwMajorVersion = (DWORD)(LOBYTE(LOWORD(dwVersion)));
 	DWORD dwMinorVersion = (DWORD)(HIBYTE(LOWORD(dwVersion)));
-	sinfo->OS_version = PIString(dwMajorVersion) + "." + PIString(dwMinorVersion);
+	sinfo->OS_version = PIString::fromNumber(dwMajorVersion) + "." + PIString::fromNumber(dwMinorVersion);
 	
 	// WinSock inint
 	WSADATA wsaData;