head	1.2;
access;
symbols
	pkgsrc-2017Q4:1.1.0.10
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.8
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.4
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.2;
locks; strict;
comment	@// @;


1.2
date	2018.03.31.19.07.54;	author joerg;	state dead;
branches;
next	1.1;
commitid	EY6EspLudCMNWDwA;

1.1
date	2017.04.01.12.38.54;	author adam;	state Exp;
branches
	1.1.2.1;
next	;
commitid	JiUzgEnzza6SuPLz;

1.1.2.1
date	2017.04.01.12.38.54;	author spz;	state dead;
branches;
next	1.1.2.2;
commitid	gle9qKpG2woFmjMz;

1.1.2.2
date	2017.04.05.06.36.45;	author spz;	state Exp;
branches;
next	;
commitid	gle9qKpG2woFmjMz;


desc
@@


1.2
log
@Update woboq_codebrowser to 2.1, fixing build with newer clang.
@
text
@$NetBSD: patch-generator_annotator.cpp,v 1.1 2017/04/01 12:38:54 adam Exp $

Fix building.

--- generator/annotator.cpp.orig	2017-04-01 12:24:27.000000000 +0000
+++ generator/annotator.cpp
@@@@ -194,7 +194,7 @@@@ std::string Annotator::htmlNameForFile(c
     }
 
     const clang::FileEntry* entry = getSourceMgr().getFileEntryForID(id);
-    if (!entry || !entry->getName())
+    if (!entry)
     {
         cache[id] = {false, {} };
         return {};
@@@@ -520,7 +520,7 @@@@ std::string Annotator::pathTo(clang::Fil
 {
   //this is a bit duplicated with the other pathTo and htmlNameForFile
 
-    if (!To || !To->getName())
+    if (!To)
         return {};
 
     std::string fromFN = htmlNameForFile(From);
@


1.1
log
@Fix building with newer LLVM
@
text
@d1 1
a1 1
$NetBSD$
@


1.1.2.1
log
@file patch-generator_annotator.cpp was added on branch pkgsrc-2017Q1 on 2017-04-05 06:36:45 +0000
@
text
@d1 24
@


1.1.2.2
log
@Pullup ticket #5233 - requested by sevan
devel/woboq_codebrowser: build fix

Revisions pulled up:
- devel/woboq_codebrowser/distinfo                              1.2
- devel/woboq_codebrowser/patches/patch-generator_annotator.cpp 1.1

-------------------------------------------------------------------
   Module Name:    pkgsrc
   Committed By:   adam
   Date:           Sat Apr  1 12:38:54 UTC 2017

   Modified Files:
           pkgsrc/devel/woboq_codebrowser: distinfo
   Added Files:
           pkgsrc/devel/woboq_codebrowser/patches: patch-generator_annotator.cpp

   Log Message:
   Fix building with newer LLVM


   To generate a diff of this commit:
   cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/woboq_codebrowser/distinfo
   cvs rdiff -u -r0 -r1.1 \
       pkgsrc/devel/woboq_codebrowser/patches/patch-generator_annotator.cpp
@
text
@a0 24
$NetBSD$

Fix building.

--- generator/annotator.cpp.orig	2017-04-01 12:24:27.000000000 +0000
+++ generator/annotator.cpp
@@@@ -194,7 +194,7 @@@@ std::string Annotator::htmlNameForFile(c
     }
 
     const clang::FileEntry* entry = getSourceMgr().getFileEntryForID(id);
-    if (!entry || !entry->getName())
+    if (!entry)
     {
         cache[id] = {false, {} };
         return {};
@@@@ -520,7 +520,7 @@@@ std::string Annotator::pathTo(clang::Fil
 {
   //this is a bit duplicated with the other pathTo and htmlNameForFile
 
-    if (!To || !To->getName())
+    if (!To)
         return {};
 
     std::string fromFN = htmlNameForFile(From);
@