From cb53c6becc10db4e1f3a6e5dd981a42566fb7153 Mon Sep 17 00:00:00 2001
From: Alain Buteau <alain.buteau@synchrotron-soleil.fr>
Date: Tue, 18 Oct 2011 17:27:51 +0000
Subject: [PATCH] MANTIS 20536

---
 include/Waveform.h | 2 +-
 src/Waveform.cpp   | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/include/Waveform.h b/include/Waveform.h
index 8dbbabe..b11057a 100644
--- a/include/Waveform.h
+++ b/include/Waveform.h
@@ -14,7 +14,7 @@
 #ifndef _WaveForm_data_H
 #define _WaveForm_data_H
 
-#include <string>
+#include <cstring>
 #include "WaveformException.h"
 #include <Xstring.h>
 
diff --git a/src/Waveform.cpp b/src/Waveform.cpp
index 5764ddc..6bfb956 100644
--- a/src/Waveform.cpp
+++ b/src/Waveform.cpp
@@ -98,8 +98,8 @@ short	OFFSET_STRUCT = 0;
 	//- prepare the cmd to get the waveform data
 	cmd = ch_name + ":WF? ALL";
 	cmdStr = new char[cmd.size()+1];
-	std::strcpy(cmdStr, cmd.c_str());
-	int length = std::strlen(cmdStr);
+	std:strcpy(cmdStr, cmd.c_str());
+	int length = strlen(cmdStr);
 
 	//- send the request
 	SocketLecroy::get_instance( )->TCP_WriteDevice(cmdStr,length,true);
-- 
GitLab