Fixes for gcc 4.6 compatibility

yandex · Apr 4, 2011 · 5d7d5ae · 5d7d5ae
1 parent 05acfee
commit 5d7d5ae
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 1 deletion.
diff --git a/pire/encoding.cpp b/pire/encoding.cpp
@@ -36,6 +36,8 @@ namespace {
 
 	class Latin1: public Encoding {
 	public:
+		Latin1() : Encoding() {}
+
 		wchar32 FromLocal(const char*& begin, const char* end) const
 		{
 			if (begin == end)
@@ -74,6 +76,8 @@ static const Latin1 latin1;
 
 	class Utf8: public Encoding {
 	public:
+		Utf8() : Encoding() {}
+
 		wchar32 FromLocal(const char*& begin, const char* end) const
 		{
 			wchar32 rune;

diff --git a/pire/extra/count.cpp b/pire/extra/count.cpp
@@ -90,7 +90,7 @@ CountingScanner::CountingScanner(const Fsm& re, const Fsm& sep)
 				YASSERT(!"Wrong transition size for backup");
 
 			NewState ns(*mr.begin(), *br.begin());
-			NewState savedNs = ns;
+			PIRE_IFDEBUG(NewState savedNs = ns);
 			unsigned long outputs = 0;
 
 			PIRE_IFDEBUG(ystring dbgout);

diff --git a/pire/stub/defaults.h b/pire/stub/defaults.h
@@ -19,6 +19,7 @@
 #define PIRE_STUB_DEFAULTS_H_INCLUDED
 
 #include <stdint.h>
+#include <stddef.h>
 
 namespace Pire {
 	typedef int8_t i8;