Merge branch 'master' into honeycomb-release

[android/aapt.git] / ResourceTable.h

diff --git a/ResourceTable.h b/ResourceTable.h
index 186c7ca8fdd8d1b7d4731e76812434f52ddf3274..bbb81408c8305f9f1271bc609ff3583a4265cc75 100644 (file)
--- a/ResourceTable.h
+++ b/ResourceTable.h
@@ -549,9 +549,9 @@ class ResourceFilter
 public:
     ResourceFilter() : mData(), mContainsPseudo(false) {}
     status_t parse(const char* arg);
 public:
     ResourceFilter() : mData(), mContainsPseudo(false) {}
     status_t parse(const char* arg);

-    bool match(int axis, uint32_t value);
-    bool match(const ResTable_config& config);
-    inline bool containsPseudo() { return mContainsPseudo; }
+    bool match(int axis, uint32_t value) const;
+    bool match(const ResTable_config& config) const;
+    inline bool containsPseudo() const { return mContainsPseudo; }

 
 private:
     KeyedVector<int,SortedVector<uint32_t> > mData;
 
 private:
     KeyedVector<int,SortedVector<uint32_t> > mData;