summaryrefslogtreecommitdiff
blob: 90d0899c0b0a8eda899dd3e74a0e19c3f7afa3df (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
From 361ec5d439b290e659cec63071f499fc0104401c Mon Sep 17 00:00:00 2001
From: Tomas Chvatal <tomas.chvatal@gmail.com>
Date: Wed, 24 Jul 2013 22:38:55 +0200
Subject: [PATCH] Fix mixing C and C++ in templates

This kills the favorite error for some gcc versions about C in the
templates.

*snip*
/usr/lib/gcc/x86_64-pc-linux-gnu/4.6.3/include/g++-v4/bits/basic_string.tcc:1068:3:
error: template with C linkage
make[2]: *** [zypp/CMakeFiles/zypp.dir/parser/xml/Node.cc.o] Error 1
*snip*

Basically we don't need to put this stuff here as it is done in the
headers themselves, so just prune the problematic code.
---
 zypp/parser/xml/Node.cc   | 3 ---
 zypp/parser/xml/Reader.cc | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/zypp/parser/xml/Node.cc b/zypp/parser/xml/Node.cc
index e3ac4cd..c90b8e1 100644
--- a/zypp/parser/xml/Node.cc
+++ b/zypp/parser/xml/Node.cc
@@ -9,11 +9,8 @@
 /** \file zypp/parser/xml/Reader.cc
  *
 */
-extern "C"
-{
 #include <libxml/xmlreader.h>
 #include <libxml/xmlerror.h>
-}
 
 #include <iostream>
 
diff --git a/zypp/parser/xml/Reader.cc b/zypp/parser/xml/Reader.cc
index 4e514f4..d06be45 100644
--- a/zypp/parser/xml/Reader.cc
+++ b/zypp/parser/xml/Reader.cc
@@ -9,11 +9,8 @@
 /** \file zypp/parser/xml/Reader.cc
  *
 */
-extern "C"
-{
 #include <libxml/xmlreader.h>
 #include <libxml/xmlerror.h>
-}
 
 #include <iostream>
 
-- 
1.8.1.5