From dab10735ea3c366859c71f0ef82d91dc6c49c583 Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Tue, 3 Dec 2019 15:18:54 +0000
Subject: [PATCH] No more <helpers/....> : helpers removed in Tango9!
---
pom.xml | 2 +-
src/AbstractElectrometerClass.cpp | 2 +-
src/KeithleyDDCProtocol.cpp | 2 +-
src/KeithleySCPIProtocol.cpp | 2 +-
src/Keithley_485.cpp | 2 +-
src/Keithley_486.cpp | 2 +-
src/Keithley_487.cpp | 2 +-
src/Keithley_617.cpp | 2 +-
src/Keithley_6485.cpp | 2 +-
src/Keithley_6487.cpp | 2 +-
src/Keithley_6512.cpp | 2 +-
src/Keithley_6514.cpp | 2 +-
src/Keithley_6517.cpp | 2 +-
src/N_PhotoConducteur.cpp | 2 +-
src/N_PhotoVoltaique.cpp | 2 +-
src/NovelecProtocol.cpp | 2 +-
src/Novelec_MCCE2.cpp | 2 +-
17 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/pom.xml b/pom.xml
index a36985f..bba5374 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.lib</groupId>
<artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
- <version>2.5.26-SNAPSHOT</version>
+ <version>2.5.26</version>
<packaging>nar</packaging>
<name>Electrometers library</name>
<description>Electrometers library</description>
diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp
index 5cd851f..6695583 100644
--- a/src/AbstractElectrometerClass.cpp
+++ b/src/AbstractElectrometerClass.cpp
@@ -136,7 +136,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#include "AbstractElectrometerClass.h"
#include "ElectrometerException.h"
diff --git a/src/KeithleyDDCProtocol.cpp b/src/KeithleyDDCProtocol.cpp
index d8884e2..443bdbb 100644
--- a/src/KeithleyDDCProtocol.cpp
+++ b/src/KeithleyDDCProtocol.cpp
@@ -17,7 +17,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <helpers/XString.h>
+#include <Xstring.h>
#include "KeithleyDDCProtocol.h"
// ============================================================================
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index ab3dd23..27af680 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -17,7 +17,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#ifndef WIN32
# include <unistd.h>
#endif
diff --git a/src/Keithley_485.cpp b/src/Keithley_485.cpp
index c554003..5a514d6 100644
--- a/src/Keithley_485.cpp
+++ b/src/Keithley_485.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#include "KeithleyDDCProtocol.h"
#include "Keithley_485.h"
diff --git a/src/Keithley_486.cpp b/src/Keithley_486.cpp
index add4177..ba2dcbe 100644
--- a/src/Keithley_486.cpp
+++ b/src/Keithley_486.cpp
@@ -19,7 +19,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <XString.h>
+#include <Xstring.h>
#include "Keithley_486.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_487.cpp b/src/Keithley_487.cpp
index 231cffa..fd0f17f 100644
--- a/src/Keithley_487.cpp
+++ b/src/Keithley_487.cpp
@@ -19,7 +19,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <XString.h>
+#include <Xstring.h>
#include "Keithley_487.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_617.cpp b/src/Keithley_617.cpp
index 01d5749..dc70d18 100644
--- a/src/Keithley_617.cpp
+++ b/src/Keithley_617.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#include "Keithley_617.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_6485.cpp b/src/Keithley_6485.cpp
index fda7b0e..5088fec 100644
--- a/src/Keithley_6485.cpp
+++ b/src/Keithley_6485.cpp
@@ -18,7 +18,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <XString.h>
+#include <Xstring.h>
#include "Keithley_6485.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/Keithley_6487.cpp b/src/Keithley_6487.cpp
index 10c84a7..95e4995 100644
--- a/src/Keithley_6487.cpp
+++ b/src/Keithley_6487.cpp
@@ -18,7 +18,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <XString.h>
+#include <Xstring.h>
#include "Keithley_6487.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/Keithley_6512.cpp b/src/Keithley_6512.cpp
index fabb245..8919229 100644
--- a/src/Keithley_6512.cpp
+++ b/src/Keithley_6512.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#include "Keithley_6512.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_6514.cpp b/src/Keithley_6514.cpp
index 1086df2..6d56793 100644
--- a/src/Keithley_6514.cpp
+++ b/src/Keithley_6514.cpp
@@ -18,7 +18,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <XString.h>
+#include <Xstring.h>
#include <tango.h> //- Tango exceptions
#include "Keithley_6514.h"
#include "KeithleySCPIProtocol.h"
diff --git a/src/Keithley_6517.cpp b/src/Keithley_6517.cpp
index 62da72a..d65dd9a 100644
--- a/src/Keithley_6517.cpp
+++ b/src/Keithley_6517.cpp
@@ -18,7 +18,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <XString.h>
+#include <Xstring.h>
#include "Keithley_6517.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/N_PhotoConducteur.cpp b/src/N_PhotoConducteur.cpp
index 9c3ff0e..a40516c 100644
--- a/src/N_PhotoConducteur.cpp
+++ b/src/N_PhotoConducteur.cpp
@@ -18,7 +18,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#include "N_PhotoConducteur.h"
#include "NovelecProtocol.h"
/*
diff --git a/src/N_PhotoVoltaique.cpp b/src/N_PhotoVoltaique.cpp
index 6b078d0..2a70465 100644
--- a/src/N_PhotoVoltaique.cpp
+++ b/src/N_PhotoVoltaique.cpp
@@ -18,7 +18,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#include "N_PhotoVoltaique.h"
#include "NovelecProtocol.h"
/*
diff --git a/src/NovelecProtocol.cpp b/src/NovelecProtocol.cpp
index cf173e6..60529a5 100644
--- a/src/NovelecProtocol.cpp
+++ b/src/NovelecProtocol.cpp
@@ -24,7 +24,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#include "NovelecProtocol.h"
//- commands numbers
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index 433ecf1..4c6329b 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -17,7 +17,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <XString.h>
+#include <Xstring.h>
#include "NovelecProtocol.h"
#include "Novelec_MCCE2.h"
--
GitLab