Merge pull request #1307 from wolfmanjm/upstreamedge

clean up defines of vector when not actually used

diff --git a/src/libs/ConfigSource.h b/src/libs/ConfigSource.h
index 2ac2d02..eb71696 100644 (file)
--- a/src/libs/ConfigSource.h
+++ b/src/libs/ConfigSource.h
@@ -8,8 +8,6 @@
 #ifndef CONFIGSOURCE_H
 #define CONFIGSOURCE_H
 
-using namespace std;
-#include <vector>
 #include <string>
 
 class ConfigValue;
@@ -23,16 +21,16 @@ class ConfigSource {
         // Read each value, and append it as a ConfigValue to the config_cache we were passed
         virtual void transfer_values_to_cache( ConfigCache* ) = 0;
         virtual bool is_named( uint16_t check_sum ) = 0;
-        virtual bool write( string setting, string value ) = 0;
-        virtual string read( uint16_t check_sums[3] ) = 0;
+        virtual bool write( std::string setting, std::string value ) = 0;
+        virtual std::string read( uint16_t check_sums[3] ) = 0;
 
     protected:
-        virtual ConfigValue* process_line_from_ascii_config(const string& line, ConfigCache* cache);
-        virtual string process_line_from_ascii_config(const string& line, uint16_t line_checksums[3]);
+        virtual ConfigValue* process_line_from_ascii_config(const std::string& line, ConfigCache* cache);
+        virtual std::string process_line_from_ascii_config(const std::string& line, uint16_t line_checksums[3]);
         uint16_t name_checksum;
 
     private:
-        ConfigValue* process_line(const string &buffer);
+        ConfigValue* process_line(const std::string &buffer);
 };
 
 

diff --git a/src/libs/SlowTicker.cpp b/src/libs/SlowTicker.cpp
index 389f048..ce765b3 100644 (file)
--- a/src/libs/SlowTicker.cpp
+++ b/src/libs/SlowTicker.cpp
@@ -5,8 +5,6 @@
       You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
 */
 
-using namespace std;
-#include <vector>
 #include "libs/nuts_bolts.h"
 #include "libs/Module.h"
 #include "libs/Kernel.h"

diff --git a/src/libs/SlowTicker.h b/src/libs/SlowTicker.h
index a0f6ce3..ca95405 100644 (file)
--- a/src/libs/SlowTicker.h
+++ b/src/libs/SlowTicker.h
@@ -11,10 +11,6 @@
 #define SLOWTICKER_H
 
 #include "Module.h"
-
-using namespace std;
-#include <vector>
-
 #include "libs/Hook.h"
 #include "libs/Pin.h"
 
@@ -52,7 +48,7 @@ class SlowTicker : public Module{
     private:
         bool flag_1s();
 
-        vector<Hook*> hooks;
+        std::vector<Hook*> hooks;
         uint32_t max_frequency;
         uint32_t interval;
 

diff --git a/src/modules/robot/Block.cpp b/src/modules/robot/Block.cpp
index a7ecaa5..9f38d5f 100644 (file)
--- a/src/modules/robot/Block.cpp
+++ b/src/modules/robot/Block.cpp
@@ -22,7 +22,6 @@
 #include <inttypes.h>
 
 using std::string;
-#include <vector>
 
 #define STEP_TICKER_FREQUENCY THEKERNEL->step_ticker->get_frequency()
 

diff --git a/src/modules/robot/Block.h b/src/modules/robot/Block.h
index d1fe98b..d324986 100644 (file)
--- a/src/modules/robot/Block.h
+++ b/src/modules/robot/Block.h
@@ -7,7 +7,6 @@
 
 #pragma once
 
-#include <vector>
 #include <bitset>
 #include "ActuatorCoordinates.h"
 

diff --git a/src/modules/robot/Conveyor.cpp b/src/modules/robot/Conveyor.cpp
index 3a07b85..9602f98 100644 (file)
--- a/src/modules/robot/Conveyor.cpp
+++ b/src/modules/robot/Conveyor.cpp
@@ -24,7 +24,6 @@
 #include "StepperMotor.h"
 
 #include <functional>
-#include <vector>
 
 #include "mbed.h"
 

diff --git a/src/modules/robot/Planner.cpp b/src/modules/robot/Planner.cpp
index 8f5cf79..82f58b9 100644 (file)
--- a/src/modules/robot/Planner.cpp
+++ b/src/modules/robot/Planner.cpp
@@ -6,7 +6,6 @@
 */
 
 using namespace std;
-#include <vector>
 
 #include "mri.h"
 #include "nuts_bolts.h"

diff --git a/src/modules/tools/temperaturecontrol/TemperatureControlPool.h b/src/modules/tools/temperaturecontrol/TemperatureControlPool.h
index c0d8767..d6f931a 100644 (file)
--- a/src/modules/tools/temperaturecontrol/TemperatureControlPool.h
+++ b/src/modules/tools/temperaturecontrol/TemperatureControlPool.h
@@ -8,8 +8,6 @@
 #ifndef TEMPERATURECONTROLPOOL_H
 #define TEMPERATURECONTROLPOOL_H
 
-#include <vector>
-
 class TemperatureControlPool {
     public:
         void load_tools();

diff --git a/src/modules/tools/toolmanager/ToolManager.cpp b/src/modules/tools/toolmanager/ToolManager.cpp
index 1668010..94a239d 100644 (file)
--- a/src/modules/tools/toolmanager/ToolManager.cpp
+++ b/src/modules/tools/toolmanager/ToolManager.cpp
@@ -7,9 +7,6 @@
 
 #include "libs/Module.h"
 #include "libs/Kernel.h"
-#include <math.h>
-using namespace std;
-#include <vector>
 #include "ToolManager.h"
 #include "Tool.h"
 #include "PublicDataRequest.h"
@@ -26,6 +23,8 @@ using namespace std;
 #include "libs/StreamOutput.h"
 #include "FileStream.h"
 
+#include <math.h>
+
 ToolManager::ToolManager()
 {
     active_tool = 0;