[llvm-branch-commits] [cfe-branch] r196008 - Merging r195792:

[Bill Wendling]

Author: void
Date: Sat Nov 30 21:46:47 2013
New Revision: 196008

URL: http://llvm.org/viewvc/llvm-project?rev=196008&view=rev
Log:
Merging r195792:
------------------------------------------------------------------------
r195792 | rsmith | 2013-11-26 14:31:59 -0800 (Tue, 26 Nov 2013) | 2 lines

Remove unused entity from .td file.

------------------------------------------------------------------------

Modified:
    cfe/branches/release_34/   (props changed)
    cfe/branches/release_34/include/clang/Basic/Attr.td

Propchange: cfe/branches/release_34/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Nov 30 21:46:47 2013
@@ -1,4 +1,4 @@
 /cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195716,195760,195768,195777,195789,195804,195827,195877,195887-195888,195897,195906,195983
+/cfe/trunk:195126,195128,195135-195136,195146,195149,195154,195158,195163,195168,195174,195268,195283,195303,195326,195329,195367,195384,195409,195420,195422,195501,195547,195556,195558,195587,195620,195669,195687,195693,195710,195716,195760,195768,195777,195789,195792,195804,195827,195877,195887-195888,195897,195906,195983
 /cfe/trunk/test:170344
 /cfe/trunk/test/SemaTemplate:126920

Modified: cfe/branches/release_34/include/clang/Basic/Attr.td
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_34/include/clang/Basic/Attr.td?rev=196008&r1=196007&r2=196008&view=diff
==============================================================================
--- cfe/branches/release_34/include/clang/Basic/Attr.td (original)
+++ cfe/branches/release_34/include/clang/Basic/Attr.td Sat Nov 30 21:46:47 2013
@@ -39,8 +39,6 @@ def NormalVar : SubsetSubject<Var, "non-
                                 S->getKind() != Decl::ImplicitParam &&
                                 S->getKind() != Decl::ParmVar &&
                                 S->getKind() != Decl::NonTypeTemplateParm}]>;
-def CXXVirtualMethod : SubsetSubject<CXXRecord, "virtual member function",
-                                     [{S->isVirtual()}]>;
 def NonBitField : SubsetSubject<Field, "non-bit field",
                                 [{!S->isBitField()}]>;