Skip to content
Snippets Groups Projects
Commit 2f058818 authored by Florent LANGLOIS's avatar Florent LANGLOIS
Browse files

Created tag release_3_1_4.

parent 46644670
Branches
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</parent> </parent>
<groupId>fr.soleil.device</groupId> <groupId>fr.soleil.device</groupId>
<artifactId>DataFitter-${aol}-${mode}</artifactId> <artifactId>DataFitter-${aol}-${mode}</artifactId>
<version>3.1.3</version> <version>3.1.4</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>DataFitter</name> <name>DataFitter</name>
<!-- use for the name of executable --> <!-- use for the name of executable -->
......
...@@ -111,6 +111,8 @@ namespace DataFitter_ns ...@@ -111,6 +111,8 @@ namespace DataFitter_ns
case Tango::DEV_LONG: case Tango::DEV_LONG:
std::copy( da.LongSeq->get_buffer(), da.LongSeq->get_buffer() + da.dim_x, vec.begin() ); std::copy( da.LongSeq->get_buffer(), da.LongSeq->get_buffer() + da.dim_x, vec.begin() );
break; break;
#if (TANGO_VERSION_MAJOR >= 8)
#pragma message "TANGO_VERSION_MAJOR >= 8"
case Tango::DEV_ULONG: case Tango::DEV_ULONG:
std::copy( da.get_ULong_data()->get_buffer(), da.get_ULong_data()->get_buffer() + da.dim_x, vec.begin() ); std::copy( da.get_ULong_data()->get_buffer(), da.get_ULong_data()->get_buffer() + da.dim_x, vec.begin() );
break; break;
...@@ -120,6 +122,18 @@ namespace DataFitter_ns ...@@ -120,6 +122,18 @@ namespace DataFitter_ns
case Tango::DEV_ULONG64: case Tango::DEV_ULONG64:
std::copy( da.get_ULong64_data()->get_buffer(), da.get_ULong64_data()->get_buffer() + da.dim_x, vec.begin() ); std::copy( da.get_ULong64_data()->get_buffer(), da.get_ULong64_data()->get_buffer() + da.dim_x, vec.begin() );
break; break;
#else
#pragma message "TANGO_VERSION_MAJOR < 8"
case Tango::DEV_ULONG:
std::copy( da.ext->ULongSeq->get_buffer(), da.ext->ULongSeq->get_buffer() + da.dim_x, vec.begin() );
break;
case Tango::DEV_LONG64:
std::copy( da.ext->Long64Seq->get_buffer(), da.ext->Long64Seq->get_buffer() + da.dim_x, vec.begin() );
break;
case Tango::DEV_ULONG64:
std::copy( da.ext->ULong64Seq->get_buffer(), da.ext->ULong64Seq->get_buffer() + da.dim_x, vec.begin() );
break;
#endif
case Tango::DEV_FLOAT: case Tango::DEV_FLOAT:
std::copy( da.FloatSeq->get_buffer(), da.FloatSeq->get_buffer() + da.dim_x, vec.begin() ); std::copy( da.FloatSeq->get_buffer(), da.FloatSeq->get_buffer() + da.dim_x, vec.begin() );
break; break;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment