aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Schupp <w.schupp@a1.net>2015-03-23 10:15:36 +0100
committerWolfgang Schupp <w.schupp@a1.net>2015-03-23 10:15:36 +0100
commitfbdb9e240f03477c1113d893176f7986fca04961 (patch)
tree8e61ab0b4f89bfe0c2ee830471ff0d684821a8c2
parent20f7439c2e37c309e1ec3444c49a5b12222661f1 (diff)
parent3911ec025847bb6f02ce191eadf2cff02cbc0995 (diff)
Merge pull request #6774 from herrnst/gcc-4.6
Fix compile with gcc-4.6 (e.g. Ubuntu Precise) after 799094a838d12cc6f9513bd576d35f37668176e8
-rw-r--r--xbmc/guilib/GUIIncludes.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/xbmc/guilib/GUIIncludes.h b/xbmc/guilib/GUIIncludes.h
index 43d7e28588..f007d995d5 100644
--- a/xbmc/guilib/GUIIncludes.h
+++ b/xbmc/guilib/GUIIncludes.h
@@ -60,7 +60,7 @@ private:
};
void ResolveIncludesForNode(TiXmlElement *node, std::map<INFO::InfoPtr, bool>* xmlIncludeConditions = NULL);
- using Params = std::map<std::string, std::string>;
+ typedef std::map<std::string, std::string> Params;
static bool GetParameters(const TiXmlElement *include, const char *valueAttribute, Params& params);
static void ResolveParametersForNode(TiXmlElement *node, const Params& params);
static ResolveParamsResult ResolveParameters(const std::string& strInput, std::string& strOutput, const Params& params);