Merge branch 'next'

1 files changed, 5 insertions, 1 deletions

diff --git a/src/mask.h b/src/mask.h
index 4608898f..ed9e8ac1 100644
--- a/src/mask.h
+++ b/src/mask.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2009, John Wiegley.  All rights reserved.
+ * Copyright (c) 2003-2010, John Wiegley.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
@@ -73,7 +73,11 @@ public:
   }
 
   mask_t& operator=(const string& other);
+  mask_t& assign_glob(const string& other);
 
+  bool operator<(const mask_t& other) const {
+    return expr < other.expr;
+  }
   bool operator==(const mask_t& other) const {
     return expr == other.expr;
   }