summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEliot Horowitz <eliot@10gen.com>2010-06-28 16:59:15 -0400
committerEliot Horowitz <eliot@10gen.com>2010-06-28 16:59:15 -0400
commit372aa5f6129425c06f5b55110a474f4da1b48dfc (patch)
tree84adbb6760af823376f51ca28fc0f053972029b2
parent4b82270f1cb25b0e19dbfa5011a21996b135c4b8 (diff)
downloadmongo-372aa5f6129425c06f5b55110a474f4da1b48dfc.tar.gz
win64 names
-rw-r--r--db/clientcursor.cpp2
-rw-r--r--db/mr.cpp2
-rw-r--r--util/log.h16
3 files changed, 10 insertions, 10 deletions
diff --git a/db/clientcursor.cpp b/db/clientcursor.cpp
index 8fa2cf15429..7cef9d5006b 100644
--- a/db/clientcursor.cpp
+++ b/db/clientcursor.cpp
@@ -258,7 +258,7 @@ namespace mongo {
sleepmicros( micros );
}
else {
- log( WARNING ) << "ClientCursor::yield can't unlock b/c of recursive lock" << endl;
+ log( LL_WARNING ) << "ClientCursor::yield can't unlock b/c of recursive lock" << endl;
}
}
diff --git a/db/mr.cpp b/db/mr.cpp
index c00a01eaf68..248f305e3a7 100644
--- a/db/mr.cpp
+++ b/db/mr.cpp
@@ -570,7 +570,7 @@ namespace mongo {
{
dbtempreleasecond tl;
if ( ! tl.unlocked() )
- log( WARNING ) << "map/reduce can't temp release" << endl;
+ log( LL_WARNING ) << "map/reduce can't temp release" << endl;
state.finalReduce( all );
}
diff --git a/util/log.h b/util/log.h
index df4d419fa1a..39aacb41ebd 100644
--- a/util/log.h
+++ b/util/log.h
@@ -29,19 +29,19 @@ namespace mongo {
using boost::shared_ptr;
- enum LogLevel { DEBUG , INFO , NOTICE , WARNING , ERROR , SEVERE };
+ enum LogLevel { LL_DEBUG , LL_INFO , LL_NOTICE , LL_WARNING , LL_ERROR , LL_SEVERE };
inline const char * logLevelToString( LogLevel l ){
switch ( l ){
- case DEBUG:
- case INFO:
- case NOTICE:
+ case LL_DEBUG:
+ case LL_INFO:
+ case LL_NOTICE:
return "";
- case WARNING:
+ case LL_WARNING:
return "warning" ;
- case ERROR:
+ case LL_ERROR:
return "ERROR";
- case SEVERE:
+ case LL_SEVERE:
return "SEVERE";
default:
return "UNKNOWN";
@@ -241,7 +241,7 @@ namespace mongo {
}
void _init(){
ss.str("");
- logLevel = INFO;
+ logLevel = LL_INFO;
}
public:
static Logstream& get() {