From 3ddafe3bafb176b4d11e5f336de5ecb188bdedaa Mon Sep 17 00:00:00 2001 From: l_maliakal_d Date: Wed, 4 Apr 2012 09:33:32 +0000 Subject: [PATCH] added the usingnamespace std for slsDetectorActions.cpp git-svn-id: file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware@170 951219d9-93cf-4727-9268-0efd64621fa3 --- slsDetectorSoftware/Makefile | 4 ++-- slsDetectorSoftware/slsDetector/slsDetectorActions.cpp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/slsDetectorSoftware/Makefile b/slsDetectorSoftware/Makefile index 0dabb964a..767a5fd67 100644 --- a/slsDetectorSoftware/Makefile +++ b/slsDetectorSoftware/Makefile @@ -1,5 +1,5 @@ CFLAGS= -DC_ONLY -#FLAGS=-DVERBOSE +FLAGS= -DVERBOSE -DVERYVERBOSE INCLUDES= -IcommonFiles -IslsDetector -IMySocketTCP -IusersFunctions -ImultiSlsDetector -IslsDetectorUtils -IslsDetectorCommand -IslsDetectorAnalysis #EPICSFLAGS=-D EPICS -I/usr/local/epics/base/include/ -I /usr/local/epics/base/include/os/Linux/ -L /usr/local/epics/base/lib/SL5-x86/ -Wl,-R/usr/local/epics/base/lib/SL5-x86 -lca -lCom @@ -64,4 +64,4 @@ install_inc: install_doc: $(shell test -d $(DESTDIR) || mkdir -p $(DESTDIR)) - cp -Pr docs/* $(DESTDIR) \ No newline at end of file + cp -Pr docs/* $(DESTDIR) diff --git a/slsDetectorSoftware/slsDetector/slsDetectorActions.cpp b/slsDetectorSoftware/slsDetector/slsDetectorActions.cpp index a20121263..54e39cb85 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorActions.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorActions.cpp @@ -1,4 +1,6 @@ #include "slsDetectorActions.h" +#include +using namespace std; /**