Skip to content

Commit

Permalink
quick fix for global namespace pollution (mostly client)
Browse files Browse the repository at this point in the history
  • Loading branch information
metagoto committed Oct 18, 2009
1 parent 25c4351 commit dbfcac2
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 2 deletions.
3 changes: 3 additions & 0 deletions shell/dbshell.cpp
Expand Up @@ -14,6 +14,9 @@ jmp_buf jbuf;
#include "../util/unittest.h"
#include "utils.h"

using namespace std;
using namespace boost::filesystem;

extern const char * jsconcatcode;

string historyFile;
Expand Down
9 changes: 7 additions & 2 deletions stdafx.h
Expand Up @@ -23,6 +23,8 @@

namespace mongo {

using namespace std;

#define NOMINMAX

#if defined(_WIN32)
Expand Down Expand Up @@ -85,7 +87,7 @@ namespace mongo {
#include "string.h"
#include "limits.h"

using namespace std;
///using namespace std;

#undef yassert
#include <boost/archive/iterators/base64_from_binary.hpp>
Expand Down Expand Up @@ -117,7 +119,10 @@ using namespace std;
#undef assert
#define assert xassert
#define yassert 1
using namespace boost::filesystem;

namespace mongo {
using namespace boost::filesystem;
}

#include "util/debug_util.h"
#include "util/goodies.h"
Expand Down
2 changes: 2 additions & 0 deletions util/log.h
Expand Up @@ -20,6 +20,8 @@

namespace mongo {

using boost::shared_ptr;

// Utility interface for stringifying object only when val() called.
class LazyString {
public:
Expand Down

0 comments on commit dbfcac2

Please sign in to comment.