summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorU-ELIOT-019992DFC\Administrator <Administrator@eliot-019992dfc.(none)>2009-02-10 13:45:51 -0500
committerU-ELIOT-019992DFC\Administrator <Administrator@eliot-019992dfc.(none)>2009-02-10 13:45:51 -0500
commit14fca8423880a48c83742c1e0b550e6cf167d872 (patch)
treeff73b6dcc0bbe02bdb4d0421ba2e1742f42ceead
parent1b6151f37bac33e50869ebaab67ba625be29cc49 (diff)
parent72eb0d50728c70eac638ddbe0689a8cfa7662607 (diff)
downloadmongo-14fca8423880a48c83742c1e0b550e6cf167d872.tar.gz
Merge branch 'master' of erh@git.10gen.com:/data/gitroot/p
-rw-r--r--db/jsobj.cpp1
-rw-r--r--db/jsobj.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/db/jsobj.cpp b/db/jsobj.cpp
index 23831829e41..16bbbdd4b1f 100644
--- a/db/jsobj.cpp
+++ b/db/jsobj.cpp
@@ -1095,6 +1095,5 @@ namespace mongo {
Labeler::Label LT( "$lt" );
Labeler::Label LTE( "$lte" );
Labeler::Label NE( "$ne" );
- Labeler::Label In( "$in" );
} // namespace mongo
diff --git a/db/jsobj.h b/db/jsobj.h
index f6a8f8a954d..500bfaaddc6 100644
--- a/db/jsobj.h
+++ b/db/jsobj.h
@@ -754,7 +754,6 @@ namespace mongo {
extern Labeler::Label LT;
extern Labeler::Label LTE;
extern Labeler::Label NE;
- extern Labeler::Label In;
class BSONObjBuilderValueStream {
public: