Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Revert "SERVER-6461: Ensure that nullstream instance is constructed b…

…efore main()."

Also revert "check that logging framework is initialized early to avoid segfault".

This reverts commit 3e54e4c,
and commit 6f6f992.
  • Loading branch information...
commit 5a63e3766e73a153c47af59acb5cc8941cadbbc9 1 parent 78f93d7
@andy10gen andy10gen authored
Showing with 1 addition and 5 deletions.
  1. +0 −3  src/mongo/util/log.cpp
  2. +1 −2  src/mongo/util/log.h
View
3  src/mongo/util/log.cpp
@@ -62,9 +62,6 @@ namespace mongo {
return Logstream::get().prolog();
}
- Nullstream::Nullstream() {}
- Nullstream::~Nullstream() {}
-
class LoggingManager {
public:
LoggingManager()
View
3  src/mongo/util/log.h
@@ -134,11 +134,10 @@ namespace mongo {
class Nullstream {
public:
- Nullstream();
- virtual ~Nullstream();
virtual Nullstream& operator<< (Tee* tee) {
return *this;
}
+ virtual ~Nullstream() {}
virtual Nullstream& operator<<(const char *) {
return *this;
}
Please sign in to comment.
Something went wrong with that request. Please try again.