Skip to content

Commit

Permalink
Removed old code based on singleton pattern
Browse files Browse the repository at this point in the history
The ELadministrator has not been a singleton for a long time. The old code was preventing the use of std::make_shared with the class.
  • Loading branch information
Dr15Jones committed Nov 18, 2020
1 parent 315a8f9 commit d08b0be
Showing 1 changed file with 2 additions and 21 deletions.
23 changes: 2 additions & 21 deletions FWCore/MessageService/src/ELadministrator.h
Original file line number Diff line number Diff line change
Expand Up @@ -59,27 +59,13 @@
namespace edm {
namespace service {

// ----------------------------------------------------------------------
// Prerequisite classes:
// ----------------------------------------------------------------------

class ELdestination;
class ELcout;
class MessageLoggerScribe;

// ----------------------------------------------------------------------
// ELadministrator:
// ----------------------------------------------------------------------

class ELadministrator { // *** Destructable Singleton Pattern ***

friend class MessageLoggerScribe; // proper ELadministrator cleanup
friend class ThreadSafeLogMessageLoggerScribe; // proper ELadministrator cleanup
friend class ELcout; // ELcout behavior

// *** Error Logger Functionality ***

class ELadministrator {
public:
ELadministrator();
~ELadministrator();

//Replaces ErrorLog which is no longer needed
Expand Down Expand Up @@ -118,11 +104,6 @@ namespace edm {
const ELseverityLevel& highSeverity() const;
int severityCounts(int lev) const;

protected:
// --- traditional birth/death, but disallowed to users:
//
ELadministrator();

private:
// --- traditional member data:
//
Expand Down

0 comments on commit d08b0be

Please sign in to comment.