From 94f9c14d526abfe9b18045fc638e8f5a3a670210 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 21 Jan 2014 18:29:55 +0100 Subject: Fix some clang warnings --- src/libexpr/eval.hh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'src/libexpr/eval.hh') diff --git a/src/libexpr/eval.hh b/src/libexpr/eval.hh index 45ab423c18..5ae5a1e3cf 100644 --- a/src/libexpr/eval.hh +++ b/src/libexpr/eval.hh @@ -82,8 +82,6 @@ void copyContext(const Value & v, PathSet & context); paths. */ typedef std::map SrcToStore; -struct EvalState; - std::ostream & operator << (std::ostream & str, const Value & v); @@ -216,9 +214,9 @@ private: inline Value * lookupVar(Env * env, const ExprVar & var, bool noEval); - friend class ExprVar; - friend class ExprAttrs; - friend class ExprLet; + friend struct ExprVar; + friend struct ExprAttrs; + friend struct ExprLet; Expr * parse(const char * text, const Path & path, const Path & basePath, StaticEnv & staticEnv); @@ -278,9 +276,9 @@ private: typedef std::map AttrSelects; AttrSelects attrSelects; - friend class ExprOpUpdate; - friend class ExprOpConcatLists; - friend class ExprSelect; + friend struct ExprOpUpdate; + friend struct ExprOpConcatLists; + friend struct ExprSelect; friend void prim_getAttr(EvalState & state, Value * * args, Value & v); }; -- cgit 1.4.1