From db1410d918c89437fd723166f9f71dbb07fb3887 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: Fri, 14 Apr 2017 13:18:53 +0000
Subject: [PATCH] git-svn-id: svn://db.shs.com.ru/pip@360
 12ceb7fc-bf1f-11e4-8940-5bc7170c53b5

---
 src/console/piconsole.h | 2 +-
 src/core/pibase.h       | 3 ---
 src/io/pifile.cpp       | 3 +++
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/console/piconsole.h b/src/console/piconsole.h
index 13ce93bf..76658653 100644
--- a/src/console/piconsole.h
+++ b/src/console/piconsole.h
@@ -480,7 +480,7 @@ inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Variable & v
 inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Variable & v) {ba >> v.name >> v.id >> (int & )v.format >> v.type >> v.size >> v.bitFrom >> v.bitCount; return ba;}
 
 inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Column & v) {ba << (int)v.alignment << v.variables; return ba;}
-inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Column & v) {ba >> (int & )v.alignment >> v.variables; return ba;}
+inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Column & v) {int a; ba >> a >> v.variables; v.alignment = (PIConsole::Alignment)a; return ba;}
 
 inline PIByteArray & operator <<(PIByteArray & ba, const PIConsole::Tab & v) {ba << v.name << v.status << (uchar)v.key << v.columns; return ba;}
 inline PIByteArray & operator >>(PIByteArray & ba, PIConsole::Tab & v) {ba >> v.name >> v.status >> (uchar&)v.key >> v.columns; return ba;}
diff --git a/src/core/pibase.h b/src/core/pibase.h
index 1b07e818..c985cbdb 100644
--- a/src/core/pibase.h
+++ b/src/core/pibase.h
@@ -141,10 +141,7 @@
 #    endif
 #    ifdef MAC_OS
 #      pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-#    else
-//#      pragma GCC diagnostic ignored "-Waggressive-loop-optimizations"
 #    endif
-#    pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #  endif
 #  ifdef ANDROID
 #    pragma GCC diagnostic ignored "-Wunused-parameter"
diff --git a/src/io/pifile.cpp b/src/io/pifile.cpp
index 8c96b857..d1e8b3b7 100755
--- a/src/io/pifile.cpp
+++ b/src/io/pifile.cpp
@@ -60,6 +60,9 @@
 #  define _stat_call_      stat64
 #  define _stat_link_      lstat64
 #endif
+#ifdef CC_GCC
+#  include <unistd.h>
+#endif
 
 
 /*! \class PIFile