From 6127f042823fe58c2c671a7cce6d1e38dfc08fef Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Mon, 9 Jul 2012 13:15:59 +0000
Subject: [PATCH] Novelec part : bug at init fixed.
---
include/CommunicationLink.h | 9 ++++++---
pom.xml | 2 +-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/include/CommunicationLink.h b/include/CommunicationLink.h
index 76b06ec..865d21a 100644
--- a/include/CommunicationLink.h
+++ b/include/CommunicationLink.h
@@ -12,9 +12,12 @@
//
// $Author: xavela $
//
-// $Revision: 1.7 $
+// $Revision: 1.8 $
//
// $Log: not supported by cvs2svn $
+// Revision 1.7 2012/07/03 06:15:53 xavela
+// Novelec part : bug at init fixed.
+//
// Revision 1.6 2010/06/10 14:36:15 xavela
// cmd switch_off called before any parameters modifications and then locked with switch_on.
//
@@ -106,11 +109,11 @@ public :
virtual std::string write_read(std::string cmd_to_send) = 0;
/**
- * \brief Performs a write read operation as string.
+ * \brief Performs a write read operation as string. (for Serialline )
*
* \throws Tango::DevFailed
*/
- virtual std::string write_read (std::string command_to_send, long nbChar) {};
+ virtual std::string write_read (std::string command_to_send, long nbChar) {return "";}
/**
diff --git a/pom.xml b/pom.xml
index 412d274..0771ebc 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.6</version>
+ <version>2.5.7</version>
<packaging>nar</packaging>
<name>Electrometers library</name>
<description>Electrometers library</description>
--
GitLab