diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-06-04 19:16:54 -0400 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-06-04 19:16:54 -0400 |
| commit | 10ab2b6492dc0b725abbb41d4e5aa423252b8a59 (patch) | |
| tree | 887e29db809d11a08370bd7f532f78a80a36d9b0 /test/unit | |
| parent | 25a01d31bffcdcc339dce332ac893460b5f4cdcf (diff) | |
| parent | d813626606c5eca8179eec492090b85dbd818867 (diff) | |
Merge branch '1.2.x'
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/expr/attribute_white.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/unit/expr/attribute_white.h b/test/unit/expr/attribute_white.h index 11a3d85c8..5ce5badd0 100644 --- a/test/unit/expr/attribute_white.h +++ b/test/unit/expr/attribute_white.h @@ -94,7 +94,7 @@ public: // and that the next ID to be assigned is strictly greater than // those that have already been assigned. - unsigned lastId = attr::LastAttributeId<string, false>::s_id; + unsigned lastId = attr::LastAttributeId<string, false>::getId(); TS_ASSERT_LESS_THAN(VarNameAttr::s_id, lastId); TS_ASSERT_LESS_THAN(TestStringAttr1::s_id, lastId); TS_ASSERT_LESS_THAN(TestStringAttr2::s_id, lastId); @@ -103,10 +103,10 @@ public: TS_ASSERT_DIFFERS(VarNameAttr::s_id, TestStringAttr2::s_id); TS_ASSERT_DIFFERS(TestStringAttr1::s_id, TestStringAttr2::s_id); - //lastId = attr::LastAttributeId<void*, false>::s_id; + //lastId = attr::LastAttributeId<void*, false>::getId(); //TS_ASSERT_LESS_THAN(theory::uf::ECAttr::s_id, lastId); - lastId = attr::LastAttributeId<bool, false>::s_id; + lastId = attr::LastAttributeId<bool, false>::getId(); TS_ASSERT_LESS_THAN(TestFlag1::s_id, lastId); TS_ASSERT_LESS_THAN(TestFlag2::s_id, lastId); TS_ASSERT_LESS_THAN(TestFlag3::s_id, lastId); @@ -123,14 +123,14 @@ public: TS_ASSERT_DIFFERS(TestFlag3::s_id, TestFlag5::s_id); TS_ASSERT_DIFFERS(TestFlag4::s_id, TestFlag5::s_id); - lastId = attr::LastAttributeId<bool, true>::s_id; + lastId = attr::LastAttributeId<bool, true>::getId(); TS_ASSERT_LESS_THAN(TestFlag1cd::s_id, lastId); TS_ASSERT_LESS_THAN(TestFlag2cd::s_id, lastId); TS_ASSERT_DIFFERS(TestFlag1cd::s_id, TestFlag2cd::s_id); cout << "1: " << TestFlag1cd::s_id << endl; cout << "2: " << TestFlag2cd::s_id << endl; - lastId = attr::LastAttributeId<Node, false>::s_id; + lastId = attr::LastAttributeId<Node, false>::getId(); // TS_ASSERT_LESS_THAN(theory::PreRewriteCache::s_id, lastId); // TS_ASSERT_LESS_THAN(theory::PostRewriteCache::s_id, lastId); // TS_ASSERT_LESS_THAN(theory::PreRewriteCacheTop::s_id, lastId); @@ -142,7 +142,7 @@ public: // TS_ASSERT_DIFFERS(theory::PostRewriteCache::s_id, theory::PostRewriteCacheTop::s_id); // TS_ASSERT_DIFFERS(theory::PreRewriteCacheTop::s_id, theory::PostRewriteCacheTop::s_id); - lastId = attr::LastAttributeId<TypeNode, false>::s_id; + lastId = attr::LastAttributeId<TypeNode, false>::getId(); TS_ASSERT_LESS_THAN(NodeManager::TypeAttr::s_id, lastId); } |