detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-11 12:27:14 +02:00
Code Issues Actions Packages Releases Activity

removal of using namespace std from theadFiles

Browse Source
This commit is contained in:
Erik Frojdh
2018-05-24 14:47:45 +02:00
parent b78b8425fd
commit 212218396a
16 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/threadFiles/CondVar.h
View File

@ -8,7 +8,6 @@
#include "Global.h"
using namespace std;
class CondVar {
public:

5
slsDetectorSoftware/threadFiles/Multi.h
View File

@ -4,7 +4,6 @@
#include "Global.h"
#include <string>
using namespace std;
class Single;
class ThreadPool;
@ -15,10 +14,10 @@ public:
Multi();
~Multi();
string executeCommand(int argc,char* argv[]);
std::string executeCommand(int argc,char* argv[]);
int printNumber(int inum);
string printString(string s);
std::string printString(std::string s);
char* printCharArray(char a[]);
int createThreadPool();

2
slsDetectorSoftware/threadFiles/Mutex.h
View File

@ -10,7 +10,7 @@
#include "Global.h"
using namespace std;
// using namespace std;
class Mutex
{

2
slsDetectorSoftware/threadFiles/Single.h
View File

@ -3,7 +3,7 @@
#include "Multi.h"
#include <string>
using namespace std;
// using namespace std;
class Single {
public:

14
slsDetectorSoftware/threadFiles/Task.h
View File

@ -14,7 +14,7 @@
#include <iostream>
#include <stdio.h>
using namespace std;
// using namespace std;
class slsDetector;
@ -121,14 +121,14 @@ protected:
func0_t <runStatus >* m4;
func1_t <int, int>* m5;
func1_t <int, double>* m6;
func1_t <string, string>* m7;
func1_t <std::string, std::string>* m7;
func1_t <detectorSettings, int>* m8;
func2_t <int, int,int>* m9;
func2_t <int, string,int>* m10;
func2_t <int, std::string,int>* m10;
func2_t <dacs_t, dacIndex,int>* m11;
func2_t <detectorSettings, detectorSettings,int>* m12;
func2_t <int64_t, timerIndex,int64_t>* m13;
func2_t <string, networkParameter,string>* m14;
func2_t <std::string, networkParameter,std::string>* m14;
func3_t <int, int,int,int>* m15;
func4_t <int, trimMode,int,int,int>* m16;
func4_t <int, int,int,detectorSettings,int>* m17;
@ -146,14 +146,14 @@ public:
Task(func0_t <runStatus >* t): SuperTask(),fnum(4){m4 = t;};
Task(func1_t <int, int>* t): SuperTask(),fnum(5){m5 = t;};
Task(func1_t <int, double>* t): SuperTask(),fnum(6){m6 = t;};
Task(func1_t <string, string>* t): SuperTask(),fnum(7){m7 = t;};
Task(func1_t <std::string, std::string>* t): SuperTask(),fnum(7){m7 = t;};
Task(func1_t <detectorSettings, int>* t): SuperTask(),fnum(8){m8 = t;};
Task(func2_t <int, int,int>* t): SuperTask(),fnum(9){m9 = t;};
Task(func2_t <int, string,int>* t): SuperTask(),fnum(10){m10 = t;};
Task(func2_t <int, std::string,int>* t): SuperTask(),fnum(10){m10 = t;};
Task(func2_t <dacs_t, dacIndex,int>* t): SuperTask(),fnum(11){m11 = t;};
Task(func2_t <detectorSettings, detectorSettings,int>* t): SuperTask(),fnum(12){m12 = t;};
Task(func2_t <int64_t, timerIndex,int64_t>* t): SuperTask(),fnum(13){m13 = t;};
Task(func2_t <string, networkParameter,string>* t): SuperTask(),fnum(14){m14 = t;};
Task(func2_t <std::string, networkParameter,std::string>* t): SuperTask(),fnum(14){m14 = t;};
Task(func3_t <int, int,int,int>* t): SuperTask(),fnum(15){m15 = t;};
Task(func4_t <int, trimMode,int,int,int>* t): SuperTask(),fnum(16){m16 = t;};
Task(func4_t <int, int,int,detectorSettings,int>* t): SuperTask(),fnum(17){m17 = t;};

2
slsDetectorSoftware/threadFiles/ThreadPool.cpp
View File

@ -1,6 +1,6 @@
#include "ThreadPool.h"
#include <pthread.h>
using namespace std;
ThreadPool::ThreadPool(int pool_size) : m_pool_size(pool_size){
#ifdef VERBOSE
cout << "Constructed ThreadPool of size " << m_pool_size << endl;

2
slsDetectorSoftware/threadFiles/ThreadPool.h
View File

@ -14,7 +14,7 @@
#include "CondVar.h"
#include "Global.h"
#include <semaphore.h>
using namespace std;
// using namespace std;
class ThreadPool