[cfe-commits] r140759 - in /cfe/trunk: include/clang/Basic/Diagnostic.h lib/Basic/DiagnosticIDs.cpp

[Daniel Dunbar]

Author: ddunbar
Date: Wed Sep 28 20:25:14 2011
New Revision: 140759

URL: http://llvm.org/viewvc/llvm-project?rev=140759&view=rev
Log:
Basic/Diagnostics: Eliminate getDiagnosticMappingInfo method, which wasn't worth methodizing.

Modified:
    cfe/trunk/include/clang/Basic/Diagnostic.h
    cfe/trunk/lib/Basic/DiagnosticIDs.cpp

Modified: cfe/trunk/include/clang/Basic/Diagnostic.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/Diagnostic.h?rev=140759&r1=140758&r2=140759&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/Diagnostic.h (original)
+++ cfe/trunk/include/clang/Basic/Diagnostic.h Wed Sep 28 20:25:14 2011
@@ -563,15 +563,6 @@
   /// \brief Report the delayed diagnostic.
   void ReportDelayed();
 
-
-  /// getDiagnosticMappingInfo - Return the mapping info currently set for the
-  /// specified builtin diagnostic.  This returns the high bit encoding, or zero
-  /// if the field is completely uninitialized.
-  diag::Mapping getDiagnosticMappingInfo(diag::kind Diag,
-                                         DiagState *State) const {
-    return State->getMapping(Diag);
-  }
-
   void setDiagnosticMappingInternal(unsigned DiagId, unsigned Map,
                                     DiagState *State,
                                     bool isUser, bool isPragma) const {

Modified: cfe/trunk/lib/Basic/DiagnosticIDs.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Basic/DiagnosticIDs.cpp?rev=140759&r1=140758&r2=140759&view=diff
==============================================================================
--- cfe/trunk/lib/Basic/DiagnosticIDs.cpp (original)
+++ cfe/trunk/lib/Basic/DiagnosticIDs.cpp Wed Sep 28 20:25:14 2011
@@ -507,8 +507,7 @@
   DiagnosticsEngine::DiagState *State = Pos->State;
 
   // Get the mapping information, if unset, compute it lazily.
-  unsigned MappingInfo = Diag.getDiagnosticMappingInfo((diag::kind)DiagID,
-                                                       State);
+  unsigned MappingInfo = State->getMapping((diag::kind) DiagID);
   if (MappingInfo == 0) {
     MappingInfo = GetDefaultDiagMapping(DiagID);
     Diag.setDiagnosticMappingInternal(DiagID, MappingInfo, State, false, false);