From 4c1747bc0b6b4fd0e957342be942f5deccc98317 Mon Sep 17 00:00:00 2001 From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr> Date: Thu, 15 Oct 2009 08:15:28 +0000 Subject: [PATCH] Win32 warning compilation --- include/Keithley_6485.h | 2 +- include/Keithley_6487.h | 2 +- include/Keithley_6514.h | 2 +- include/Keithley_6517.h | 2 +- src/Keithley_6485.cpp | 2 +- src/Keithley_6487.cpp | 2 +- src/Keithley_6514.cpp | 2 +- src/Keithley_6517.cpp | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/include/Keithley_6485.h b/include/Keithley_6485.h index a8c9de0..a02dfeb 100644 --- a/include/Keithley_6485.h +++ b/include/Keithley_6485.h @@ -63,7 +63,7 @@ public: /** * \brief Methods to configure the integration mode. */ - void set_knplc (float); + void set_knplc (double); void set_triggercount (short); void set_buffer_size (short); void init_keithley (void); diff --git a/include/Keithley_6487.h b/include/Keithley_6487.h index 67cf108..255aa49 100644 --- a/include/Keithley_6487.h +++ b/include/Keithley_6487.h @@ -68,7 +68,7 @@ public: /** * \brief Methods to configure the integration mode. */ - void set_knplc (float); + void set_knplc (double); void set_triggercount (short); void set_buffer_size (short); void init_keithley (void); diff --git a/include/Keithley_6514.h b/include/Keithley_6514.h index f234640..6211165 100644 --- a/include/Keithley_6514.h +++ b/include/Keithley_6514.h @@ -71,7 +71,7 @@ public: /** * \brief Methods to configure the integration mode. */ - void set_knplc (float); + void set_knplc (double); void set_triggercount (short); void set_buffer_size (short); void init_keithley (void); diff --git a/include/Keithley_6517.h b/include/Keithley_6517.h index cffe442..05f3312 100644 --- a/include/Keithley_6517.h +++ b/include/Keithley_6517.h @@ -75,7 +75,7 @@ public: /** * \brief Methods to configure the integration mode. */ - void set_knplc (float); + void set_knplc (double); void set_triggercount (short); void set_buffer_size (short); void init_keithley (void); diff --git a/src/Keithley_6485.cpp b/src/Keithley_6485.cpp index 9174d00..e3b83cd 100644 --- a/src/Keithley_6485.cpp +++ b/src/Keithley_6485.cpp @@ -222,7 +222,7 @@ std::vector<double> Keithley_6485::get_fetchValue (void) // ============================================================================ // Keithley_6485::set_knplc // ============================================================================ -void Keithley_6485::set_knplc (float numPLC) +void Keithley_6485::set_knplc (double numPLC) { std::stringstream cmd_to_send; diff --git a/src/Keithley_6487.cpp b/src/Keithley_6487.cpp index 9c5998f..3579072 100644 --- a/src/Keithley_6487.cpp +++ b/src/Keithley_6487.cpp @@ -228,7 +228,7 @@ double delta = 0; // ============================================================================ // Keithley_6487::set_knplc // ============================================================================ -void Keithley_6487::set_knplc (float numPLC) +void Keithley_6487::set_knplc (double numPLC) { std::stringstream cmd_to_send; diff --git a/src/Keithley_6514.cpp b/src/Keithley_6514.cpp index b8dae17..914588a 100644 --- a/src/Keithley_6514.cpp +++ b/src/Keithley_6514.cpp @@ -366,7 +366,7 @@ double delta = 0; // ============================================================================ // Keithley_6514::set_knplc // ============================================================================ -void Keithley_6514::set_knplc (float numPLC) +void Keithley_6514::set_knplc (double numPLC) { std::stringstream cmd_to_send; diff --git a/src/Keithley_6517.cpp b/src/Keithley_6517.cpp index 16ce41f..0da00d0 100644 --- a/src/Keithley_6517.cpp +++ b/src/Keithley_6517.cpp @@ -432,7 +432,7 @@ void Keithley_6517::averageStateOFF (void) // ============================================================================ // Keithley_6517::set_knplc // ============================================================================ -void Keithley_6517::set_knplc (float numPLC) +void Keithley_6517::set_knplc (double numPLC) { std::stringstream cmd_to_send; -- GitLab