merge the trunk with the development of ZeroMQ branch

git-svn-id: https://subversion.gsi.de/fairroot/fairbase/trunk@22451 0381ead4-6506-0410-b988-94b70fbc4730
This commit is contained in:
Mohammad Al-Turany
2013-10-25 12:42:48 +00:00
parent d65d7e490f
commit 5121fe3ae5
36 changed files with 1291 additions and 727 deletions

View File

@@ -9,9 +9,7 @@
#define FAIRMQLOGGER_H_
#include <string>
#include <sstream>
//#ifndef _MAKECINT_
#include <sys/time.h>
//#endif
#include "Rtypes.h"
#include "TString.h"
@@ -23,7 +21,7 @@ class FairMQLogger
TString fBindAddress;
public:
enum {
DEBUG, INFO, ERROR
DEBUG, INFO, ERROR, STATE
};
FairMQLogger();
FairMQLogger(TString bindAdress);