From cec9dc5fdb1471ae2f798c2f52c08d982f2934ff Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Fri, 23 Jun 2017 07:30:02 +0000
Subject: [PATCH] Release preparation : helpers/Xstring.h changed to
helpers/XString.h to compile on Linux and Windows OS's
---
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 7dedecb..ae94ed8 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.24-SNAPSHOT</version>
+ <version>2.5.24</version>
<packaging>nar</packaging>
<name>Electrometers library</name>
<description>Electrometers library</description>
diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp
index 46dc216..1ae451b 100644
--- a/src/AbstractElectrometerClass.cpp
+++ b/src/AbstractElectrometerClass.cpp
@@ -136,7 +136,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "AbstractElectrometerClass.h"
#include "ElectrometerException.h"
diff --git a/src/KeithleyDDCProtocol.cpp b/src/KeithleyDDCProtocol.cpp
index 53377f7..d8884e2 100644
--- a/src/KeithleyDDCProtocol.cpp
+++ b/src/KeithleyDDCProtocol.cpp
@@ -17,7 +17,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "KeithleyDDCProtocol.h"
// ============================================================================
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index a38faa6..564ab93 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -17,7 +17,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#ifndef WIN32
# include <unistd.h>
#endif
diff --git a/src/Keithley_485.cpp b/src/Keithley_485.cpp
index 09cd71e..e291530 100644
--- a/src/Keithley_485.cpp
+++ b/src/Keithley_485.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "KeithleyDDCProtocol.h"
#include "Keithley_485.h"
diff --git a/src/Keithley_486.cpp b/src/Keithley_486.cpp
index 1aaf3a3..a781d94 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 <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_486.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_487.cpp b/src/Keithley_487.cpp
index 0d4a9b6..8b3436c 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 <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_487.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_617.cpp b/src/Keithley_617.cpp
index d9592c6..3c0026b 100644
--- a/src/Keithley_617.cpp
+++ b/src/Keithley_617.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_617.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_6485.cpp b/src/Keithley_6485.cpp
index 6c48266..72f3b56 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 <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_6485.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/Keithley_6487.cpp b/src/Keithley_6487.cpp
index f68e87a..420d317 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 <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_6487.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/Keithley_6512.cpp b/src/Keithley_6512.cpp
index 3955dfa..0a4d73d 100644
--- a/src/Keithley_6512.cpp
+++ b/src/Keithley_6512.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_6512.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_6514.cpp b/src/Keithley_6514.cpp
index a2bcd40..f3318da 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 <helpers/Xstring.h>
+#include <helpers/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 61e9024..7ef123c 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 <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_6517.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/N_PhotoConducteur.cpp b/src/N_PhotoConducteur.cpp
index 30d811e..d97cc1e 100644
--- a/src/N_PhotoConducteur.cpp
+++ b/src/N_PhotoConducteur.cpp
@@ -18,7 +18,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "N_PhotoConducteur.h"
#include "NovelecProtocol.h"
/*
diff --git a/src/N_PhotoVoltaique.cpp b/src/N_PhotoVoltaique.cpp
index 7460499..a78a09a 100644
--- a/src/N_PhotoVoltaique.cpp
+++ b/src/N_PhotoVoltaique.cpp
@@ -18,7 +18,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "N_PhotoVoltaique.h"
#include "NovelecProtocol.h"
/*
diff --git a/src/NovelecProtocol.cpp b/src/NovelecProtocol.cpp
index bbe03cc..e2ab522 100644
--- a/src/NovelecProtocol.cpp
+++ b/src/NovelecProtocol.cpp
@@ -24,7 +24,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "NovelecProtocol.h"
//- commands numbers
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index 103e6fe..903c6a6 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -17,7 +17,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <helpers/Xstring.h>
+#include <helpers/XString.h>
#include "NovelecProtocol.h"
#include "Novelec_MCCE2.h"
--
GitLab