From 305ad8a0f2fc21f64a2c1e7e1d97769f5fd4288a Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Tue, 10 Apr 2012 09:34:54 +0000
Subject: [PATCH] compilation error fixed
---
pom.xml | 2 +-
src/KeithleySCPIProtocol.cpp | 4 ++--
src/TangoSerialLink.cpp | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index a32a08b..45c9c7d 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.4</version>
+ <version>2.5.5</version>
<packaging>nar</packaging>
<name>Electrometers library</name>
<description>Electrometers library</description>
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index 147c720..5dd54f2 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -939,7 +939,7 @@ void KeithleySCPIProtocol::set_averagecount (std::string nbAverageCount)
// ============================================================================
// KeithleySCPIProtocol::set_averagecount
// ============================================================================
-void KeithleySCPIProtocol::set_averagecount_K6517 (std::string cmd_to_send)
+void KeithleySCPIProtocol::set_averagecount_K6517 (std::string nbAverageCount)
{
if( !this->_communication_link )
{
@@ -956,7 +956,7 @@ void KeithleySCPIProtocol::set_averagecount_K6517 (std::string cmd_to_send)
tmpMode.erase( tmpMode.find("\n") );
//- send command
- std::string cmd_to_send = tmpMode + ":AVER:COUN " + cmd_to_send ;
+ std::string cmd_to_send = tmpMode + ":AVER:COUN " + nbAverageCount ;
_communication_link->write(cmd_to_send);
}
diff --git a/src/TangoSerialLink.cpp b/src/TangoSerialLink.cpp
index 7cfc104..70a64ef 100644
--- a/src/TangoSerialLink.cpp
+++ b/src/TangoSerialLink.cpp
@@ -117,7 +117,7 @@ void TangoSerialLink::create_serial_proxy (void) throw (Tango::DevFailed)
this->_serial_proxy = 0;
}
_is_serial_proxy_created = false;
- description = "Unable to write command : " + command_to_send + "\nmemory allocation failed.";
+ description = "Unable to create proxy on : " + _communication_Device_name + "\nmemory allocation failed.";
Tango::Except::throw_exception (
(const char*)"ALLOCATION_ERROR",
description.c_str(),
--
GitLab