From 3e02a6fa18338c3bb0fed86e5308500d3bc1d8a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Anders=20Sandstr=C3=B6m?= <anders.sandstroem@psi.ch>
Date: Mon, 14 Aug 2023 15:09:09 +0200
Subject: [PATCH] make complile at PSI

---
 tempGNUmakefile => GNUmakefile          |  3 ++-
 Makefile                                | 28 -------------------------
 ecmc_plugin_motion/src/ecmcDataBuffer.h |  7 ++++---
 3 files changed, 6 insertions(+), 32 deletions(-)
 rename tempGNUmakefile => GNUmakefile (96%)
 delete mode 100644 Makefile

diff --git a/tempGNUmakefile b/GNUmakefile
similarity index 96%
rename from tempGNUmakefile
rename to GNUmakefile
index 7c2f1a0..a30dcb9 100644
--- a/tempGNUmakefile
+++ b/GNUmakefile
@@ -5,7 +5,8 @@ MODULE = ecmc_plugin_motion
 BUILDCLASSES = Linux
 ARCH_FILTER = deb10%
 
-EXCLUDE_VERSIONS+=3 7.0.5
+# Run 7.0.6 for now
+EXCLUDE_VERSIONS+=3 7.0.5 7.0.7
 
 IGNORE_MODULES += asynMotor
 IGNORE_MODULES += motorBase
diff --git a/Makefile b/Makefile
deleted file mode 100644
index 48d516b..0000000
--- a/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-#  Copyright (c) 2018 - 2019  European Spallation Source ERIC
-#
-#  The program is free software: you can redistribute
-#  it and/or modify it under the terms of the GNU General Public License
-#  as published by the Free Software Foundation, either version 2 of the
-#  License, or any newer version.
-#
-#  This program is distributed in the hope that it will be useful, but WITHOUT
-#  ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-#  FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
-#  more details.
-#
-#  You should have received a copy of the GNU General Public License along with
-#  this program. If not, see https://www.gnu.org/licenses/gpl-2.0.txt
-#
-# 
-# Author  : Jeong Han Lee
-# email   : han.lee@esss.se
-# Date    : 2020Mar22-1607-33CET
-# version : 1.0.0
-
-TOP:=$(CURDIR)
-
-include $(TOP)/configure/CONFIG
-
-include $(TOP)/configure/RULES
-
diff --git a/ecmc_plugin_motion/src/ecmcDataBuffer.h b/ecmc_plugin_motion/src/ecmcDataBuffer.h
index a64d728..5bd6bfe 100644
--- a/ecmc_plugin_motion/src/ecmcDataBuffer.h
+++ b/ecmc_plugin_motion/src/ecmcDataBuffer.h
@@ -28,7 +28,7 @@
 
 template <typename T>
 struct dataBuffer {      
-  T *data;
+  T      *data;
   int     dataCounter;
   int     id;
 };
@@ -86,6 +86,7 @@ class ecmcDataBuffer {
     
     initAsyn();
   }
+
   ~ecmcDataBuffer()  {
     delete[] buffer1_.data;
     delete[] buffer2_.data;
@@ -183,7 +184,7 @@ template<> inline void ecmcDataBuffer<epicsInt16>::writeBuffer() {
 }
 
 // specialized for epicsInt32
-template<> inline void ecmcDataBuffer<int32_t>::writeBuffer() {
+template<> inline void ecmcDataBuffer<epicsInt32>::writeBuffer() {
     epicsMutexLock(bufferSwitchMutex_);
     // Write asyn
     asynPort_->lock();
@@ -195,7 +196,7 @@ template<> inline void ecmcDataBuffer<int32_t>::writeBuffer() {
 }
 
 // specialized for epicsInt64
-template<> inline void ecmcDataBuffer<int64_t>::writeBuffer() {
+template<> inline void ecmcDataBuffer<epicsInt64>::writeBuffer() {
     epicsMutexLock(bufferSwitchMutex_);
     // Write asyn
     asynPort_->lock();