Fixed: Build failures on clang

The actual errors were in the files surface.h, materials.h, and the
.cpp files in the commit.

Also fixed doxygen comments at header ending #endif (should be a normal
comment).

doomsday/client/include/audio/s_main.h

@@ -95,4 +95,4 @@ void S_Drawer(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_SOUND_MAIN_H
+#endif // LIBDENG_SOUND_MAIN_H

doomsday/client/include/busymode.h

@@ -54,4 +54,4 @@ BusyTask* BusyMode_CurrentTask(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_CORE_BUSYMODE_H
+#endif // LIBDENG_CORE_BUSYMODE_H

doomsday/client/include/client/cl_player.h

@@ -81,4 +81,4 @@ boolean         ClPlayer_IsFreeToMove(int plrnum);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_CLIENT_PLAYER_H
+#endif // LIBDENG_CLIENT_PLAYER_H

doomsday/client/include/color.h

@@ -62,4 +62,4 @@ float ColorRawf_AverageColorMulAlpha(ColorRawf* color);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_DATA_COLOR_H
+#endif // LIBDENG_DATA_COLOR_H

doomsday/client/include/con_bar.h

@@ -56,4 +56,4 @@ boolean Con_IsProgressAnimationCompleted(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_CONSOLE_PROGRESSBAR_H
+#endif // LIBDENG_CONSOLE_PROGRESSBAR_H

doomsday/client/include/de_bsp.h

@@ -25,4 +25,4 @@
 
 #include "edit_bsp.h"
 
-#endif /// LIBDENG_BSP
+#endif // LIBDENG_BSP

doomsday/client/include/edit_bias.h

@@ -49,4 +49,4 @@ boolean SBE_UsingHueCircle(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_BIAS_EDITOR
+#endif // LIBDENG_BIAS_EDITOR

doomsday/client/include/edit_bsp.h

@@ -64,4 +64,4 @@ void MPE_SaveBsp(BspBuilder_c* builder, GameMap* map, uint numEditableVertexes,
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_MAP_EDIT_BSP_H
+#endif // LIBDENG_MAP_EDIT_BSP_H

doomsday/client/include/filesys/fs_util.h

@@ -176,4 +176,4 @@ bool F_MatchFileName(de::String const &filePath, de::String const &pattern);
 
 #endif
 
-#endif /// LIBDENG_FILESYS_UTIL_H
+#endif // LIBDENG_FILESYS_UTIL_H

doomsday/client/include/gl/gl_draw.h

@@ -65,4 +65,4 @@ void GL_DrawFilter(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_GRAPHICS_DRAW_H
+#endif // LIBDENG_GRAPHICS_DRAW_H

doomsday/client/include/gl/gl_tex.h

@@ -258,4 +258,4 @@ void GL_DeSaturatePalettedImage(uint8_t* buffer, struct colorpalette_s* palette,
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_IMAGE_MANIPULATION_H
+#endif // LIBDENG_IMAGE_MANIPULATION_H

doomsday/client/include/gl/svg.h

@@ -74,4 +74,4 @@ Svg* Svg_FromDef(svgid_t uniqueId, const def_svgline_t* lines, uint numLines);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_REFRESH_SVG_H
+#endif // LIBDENG_REFRESH_SVG_H

doomsday/client/include/gridmap.h

@@ -206,4 +206,4 @@ void Gridmap_DebugDrawer(const Gridmap* gridmap);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_DATA_GRIDMAP_H
+#endif // LIBDENG_DATA_GRIDMAP_H

doomsday/client/include/m_misc.h

@@ -120,4 +120,4 @@ boolean M_CheckTrigger(const trigger_t* trigger, timespan_t advanceTime);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_M_MISC_H
+#endif // LIBDENG_M_MISC_H

doomsday/client/include/map/blockmap.h

@@ -200,4 +200,4 @@ const Gridmap* Blockmap_Gridmap(Blockmap* blockmap);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_MAP_BLOCKMAP_H
+#endif // LIBDENG_MAP_BLOCKMAP_H

doomsday/client/include/map/blockmapvisual.h

@@ -33,4 +33,4 @@ DENG_EXTERN_C float bmapDebugSize; ///< cvar
  */
 DENG_EXTERN_C void Rend_BlockmapDebug(void);
 
-#endif /// LIBDENG_MAP_BLOCKMAP_VISUAL_H
+#endif // LIBDENG_MAP_BLOCKMAP_VISUAL_H

doomsday/client/include/map/bsp/bsptreenode.h

@@ -28,4 +28,4 @@
 /// Nodes in BspBuilder's internal tree are modelled with this type.
 typedef de::BinaryTree<de::MapElement *> BspTreeNode;
 
-#endif /// LIBDENG_BSPBUILDER_BSPTREENODE
+#endif // LIBDENG_BSPBUILDER_BSPTREENODE

doomsday/client/include/map/bsp/hedgeinfo.h

@@ -99,4 +99,4 @@ struct HEdgeInfo
 } // namespace bsp
 } // namespace de
 
-#endif /// LIBDENG_BSP_HEDGEINFO
+#endif // LIBDENG_BSP_HEDGEINFO

doomsday/client/include/map/bsp/hedgeintercept.h

@@ -72,4 +72,4 @@ struct HEdgeIntercept
 } // namespace bsp
 } // namespace de
 
-#endif /// LIBDENG_BSP_HEDGEINTERCEPT
+#endif // LIBDENG_BSP_HEDGEINTERCEPT

doomsday/client/include/map/bsp/hedgetip.h

@@ -95,4 +95,4 @@ class HEdgeTip
 } // namespace bsp
 } // namespace de
 
-#endif /// LIBDENG_BSP_HEDGETIP
+#endif // LIBDENG_BSP_HEDGETIP

doomsday/client/include/map/bsp/hplane.h

@@ -175,4 +175,4 @@ class HPlane
 } // namespace bsp
 } // namespace de
 
-#endif /// LIBDENG_BSP_HPLANE
+#endif // LIBDENG_BSP_HPLANE

doomsday/client/include/map/bsp/linedefinfo.h

@@ -89,4 +89,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(LineDefInfo::Flags)
 } // namespace bsp
 } // namespace de
 
-#endif /// LIBDENG_BSPBUILDER_LINEDEFINFO
+#endif // LIBDENG_BSPBUILDER_LINEDEFINFO

doomsday/client/include/map/bsp/partitioncost.h

@@ -111,4 +111,4 @@ struct PartitionCost
 } // namespace bsp
 } // namespace de
 
-#endif /// LIBDENG_BSP_PARTITIONCOST
+#endif // LIBDENG_BSP_PARTITIONCOST

doomsday/client/include/map/bsp/partitioner.h

@@ -140,4 +140,4 @@ class Partitioner
 } // namespace bsp
 } // namespace de
 
-#endif /// LIBDENG_BSP_PARTITIONER
+#endif // LIBDENG_BSP_PARTITIONER

doomsday/client/include/map/bsp/superblockmap.h

@@ -290,4 +290,4 @@ class SuperBlock
 } // namespace bsp
 } // namespace de
 
-#endif /// LIBDENG_BSP_SUPERBLOCKMAP
+#endif // LIBDENG_BSP_SUPERBLOCKMAP

doomsday/client/include/map/bspbuilder.h

@@ -135,4 +135,4 @@ class BspBuilder
 
 } // namespace de
 
-#endif /// LIBDENG_BSPBUILDER
+#endif // LIBDENG_BSPBUILDER

doomsday/client/include/map/bspleaf.h

@@ -120,4 +120,4 @@ int BspLeaf_GetProperty(const BspLeaf* bspLeaf, setargs_t* args);
  */
 int BspLeaf_SetProperty(BspLeaf* bspLeaf, const setargs_t* args);
 
-#endif /// LIBDENG_MAP_BSPLEAF
+#endif // LIBDENG_MAP_BSPLEAF

doomsday/client/include/map/bspnode.h

@@ -76,4 +76,4 @@ BspNode* BspNode_SetChildBounds(BspNode* node, int left, AABoxd* bounds);
 #define BspNode_SetRightBounds(node, bounds) BspNode_SetChildBounds((node), false, (bounds))
 #define BspNode_SetLeftBounds(node,  bounds) BspNode_SetChildBounds((node), true,  (bounds))
 
-#endif /// LIBDENG_MAP_BSPNODE
+#endif // LIBDENG_MAP_BSPNODE

doomsday/client/include/map/entitydatabase.h

@@ -67,4 +67,4 @@ boolean EntityDatabase_SetProperty(EntityDatabase* db, struct mapentitypropertyd
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_MAP_ENTITYDATABASE_H
+#endif // LIBDENG_MAP_ENTITYDATABASE_H

doomsday/client/include/map/gamemap.h

@@ -824,4 +824,4 @@ void GameMap_InitPolyobjBlockmap(GameMap* map, const_pvec2d_t min, const_pvec2d_
 // The current map.
 DENG_EXTERN_C GameMap* theMap;
 
-#endif /// LIBDENG_GAMEMAP_H
+#endif // LIBDENG_GAMEMAP_H

doomsday/client/include/map/generators.h

@@ -162,4 +162,4 @@ int Generators_IterateList(Generators* generators, uint listIndex,
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_MAP_GENERATORS
+#endif // LIBDENG_MAP_GENERATORS

doomsday/client/include/map/hedge.h

@@ -138,4 +138,4 @@ int HEdge_GetProperty(const HEdge* hedge, setargs_t* args);
  */
 int HEdge_SetProperty(HEdge* hedge, const setargs_t* args);
 
-#endif /// LIBDENG_MAP_HEDGE
+#endif // LIBDENG_MAP_HEDGE

doomsday/client/include/map/linedef.h

@@ -269,4 +269,4 @@ int LineDef_GetProperty(const LineDef* lineDef, setargs_t* args);
  */
 int LineDef_SetProperty(LineDef* lineDef, const setargs_t* args);
 
-#endif /// LIBDENG_MAP_LINEDEF
+#endif // LIBDENG_MAP_LINEDEF

doomsday/client/include/map/p_mapdata.h

@@ -184,4 +184,4 @@ void P_ShutdownMapEntityDefs(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_PLAY_MAPDATA_H
+#endif // LIBDENG_PLAY_MAPDATA_H

doomsday/client/include/map/p_maputil.h

@@ -105,4 +105,4 @@ int PIT_AddMobjIntercepts(mobj_t* mobj, void* parameters);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_MAP_UTILITIES_H
+#endif // LIBDENG_MAP_UTILITIES_H

doomsday/client/include/map/p_object.h

@@ -76,4 +76,4 @@ coord_t Mobj_ApproxPointDistance(mobj_t* start, coord_t const* point);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_MAP_MOBJ
+#endif // LIBDENG_MAP_MOBJ

doomsday/client/include/map/p_particle.h

@@ -197,4 +197,4 @@ float P_GetParticleZ(particle_t const *pt);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_MAP_GENERATORS_H
+#endif // LIBDENG_MAP_GENERATORS_H

doomsday/client/include/map/p_polyobjs.h

@@ -43,4 +43,4 @@ void P_PolyobjChanged(Polyobj* po);
  */
 //boolean P_PolyobjMove(Polyobj* polyobj, coord_t xy[]);
 
-#endif /// LIBDENG_P_POLYOBJS_H
+#endif // LIBDENG_P_POLYOBJS_H

doomsday/client/include/map/p_sight.h

@@ -38,4 +38,4 @@
 boolean GameMap_CheckLineSight(GameMap* map, const coord_t from[3], const coord_t to[3],
     coord_t bottomSlope, coord_t topSlope, int flags);
 
-#endif /// LIBDENG_MAP_GAMEMAP_SIGHT_H
+#endif // LIBDENG_MAP_GAMEMAP_SIGHT_H

doomsday/client/include/map/plane.h

@@ -123,4 +123,4 @@ int Plane_GetProperty(const Plane* plane, setargs_t* args);
  */
 int Plane_SetProperty(Plane* plane, const setargs_t* args);
 
-#endif /// LIBDENG_MAP_PLANE
+#endif // LIBDENG_MAP_PLANE

doomsday/client/include/map/polyobj.h

@@ -95,4 +95,4 @@ boolean Polyobj_SetProperty(Polyobj* po, const setargs_t* args);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_MAP_POLYOB_H
+#endif // LIBDENG_MAP_POLYOB_H

doomsday/client/include/map/propertyvalue.h

@@ -179,4 +179,4 @@ class PropertyFloatValue : public PropertyValue
  */
 PropertyValue* BuildPropertyValue(valuetype_t type, void* valueAdr);
 
-#endif /// LIBDENG_DATA_PROPERTYVALUE_H
+#endif // LIBDENG_DATA_PROPERTYVALUE_H

doomsday/client/include/map/sector.h

@@ -173,4 +173,4 @@ int Sector_GetProperty(const Sector* sector, setargs_t* args);
  */
 int Sector_SetProperty(Sector* sector, const setargs_t* args);
 
-#endif /// LIBDENG_MAP_SECTOR
+#endif // LIBDENG_MAP_SECTOR

doomsday/client/include/map/sidedef.h

@@ -165,4 +165,4 @@ int SideDef_GetProperty(const SideDef* sideDef, setargs_t* args);
  */
 int SideDef_SetProperty(SideDef* sideDef, const setargs_t* args);
 
-#endif /// LIBDENG_MAP_SIDEDEF
+#endif // LIBDENG_MAP_SIDEDEF

doomsday/client/include/map/surface.h

@@ -210,12 +210,12 @@ class Surface : public de::MapElement
      * Clear all the projected (light) decoration sources for the surface.
      */
     void clearDecorations();
-#endif __CLIENT__
+#endif // __CLIENT__
 };
 
 struct surfacedecorsource_s;
 
 /// Set of surfaces.
 typedef QSet<Surface *> SurfaceSet;
 
-#endif /// LIBDENG_MAP_SURFACE
+#endif // LIBDENG_MAP_SURFACE

doomsday/client/include/map/vertex.h

@@ -116,4 +116,4 @@ int Vertex_GetProperty(const Vertex* vertex, setargs_t* args);
  */
 int Vertex_SetProperty(Vertex* vertex, const setargs_t* args);
 
-#endif /// LIBDENG_MAP_VERTEX
+#endif // LIBDENG_MAP_VERTEX

doomsday/client/include/render/lumobj.h

@@ -241,4 +241,4 @@ void LO_DrawLumobjs(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_RENDER_LUMINOUS_H
+#endif // LIBDENG_RENDER_LUMINOUS_H

doomsday/client/include/render/r_lgrid.h

@@ -64,4 +64,4 @@ void LG_Debug(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_REFRESH_LIGHT_GRID_H
+#endif // LIBDENG_REFRESH_LIGHT_GRID_H

doomsday/client/include/render/rend_bias.h

@@ -127,4 +127,4 @@ void            SB_SetColor(float* dest, float* src);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_RENDER_SHADOWBIAS_H
+#endif // LIBDENG_RENDER_SHADOWBIAS_H

doomsday/client/include/render/rend_clip.h

@@ -96,4 +96,4 @@ void C_Ranger(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_RENDER_CLIP_H
+#endif // LIBDENG_RENDER_CLIP_H

doomsday/client/include/render/rend_fakeradio.h

@@ -121,4 +121,4 @@ void Rend_DrawShadowOffsetVerts(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_RENDER_FAKERADIO_H
+#endif // LIBDENG_RENDER_FAKERADIO_H

doomsday/client/include/render/rend_model.h

@@ -141,4 +141,4 @@ void Rend_RenderModel(const rendmodelparams_t* params);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_RENDER_MODEL_H
+#endif // LIBDENG_RENDER_MODEL_H

doomsday/client/include/render/rend_particle.h

@@ -72,4 +72,4 @@ void Rend_RenderGenerators(void);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_RENDER_PARTICLE_H
+#endif // LIBDENG_RENDER_PARTICLE_H

doomsday/client/include/resource/compositetexture.h

@@ -184,4 +184,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(CompositeTexture::Flags)
 
 } // namespace de
 
-#endif /// LIBDENG_RESOURCE_COMPOSITETEXTURE_H
+#endif // LIBDENG_RESOURCE_COMPOSITETEXTURE_H

doomsday/client/include/resource/materials.h

@@ -35,6 +35,8 @@
 
 namespace de {
 
+class MaterialManifest;
+
 /**
  * Specialized resource collection for a set of materials.
  *

doomsday/client/include/resource/models.h

@@ -181,4 +181,4 @@ int Models_CacheForMobj(thinker_t* th, void* context);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_RESOURCE_MODELS_H
+#endif // LIBDENG_RESOURCE_MODELS_H

doomsday/client/include/resource/patch.h

@@ -110,4 +110,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Patch::Flags)
 
 } // namespace de
 
-#endif /// LIBDENG_RESOURCE_PATCH_H
+#endif // LIBDENG_RESOURCE_PATCH_H

doomsday/client/include/resource/r_data.h

@@ -77,4 +77,4 @@ de::Texture *R_FindTextureByResourceUri(de::String schemeName, de::Uri const *re
 de::Texture *R_DefineTexture(de::String schemeName, de::Uri const &resourceUri, de::Vector2i const &dimensions);
 de::Texture *R_DefineTexture(de::String schemeName, de::Uri const &resourceUri);
 
-#endif /// LIBDENG_REFRESH_DATA_H
+#endif // LIBDENG_REFRESH_DATA_H

doomsday/client/include/resource/texture.h

@@ -390,4 +390,4 @@ typedef Texture::Variant TextureVariant;
 
 struct texture_s; // The texture instance (opaque).
 
-#endif /// LIBDENG_RESOURCE_TEXTURE_H
+#endif // LIBDENG_RESOURCE_TEXTURE_H

doomsday/client/include/resource/texturemanifest.h

@@ -194,4 +194,4 @@ class TextureManifest : public PathTree::Node
 
 } // namespace de
 
-#endif /// LIBDENG_RESOURCE_TEXTUREMANIFEST_H
+#endif // LIBDENG_RESOURCE_TEXTUREMANIFEST_H

doomsday/client/include/resource/texturescheme.h

@@ -130,4 +130,4 @@ class TextureScheme
 
 } // namespace de
 
-#endif /// LIBDENG_RESOURCE_TEXTURESCHEME_H
+#endif // LIBDENG_RESOURCE_TEXTURESCHEME_H

doomsday/client/include/ui/b_main.h

@@ -71,4 +71,4 @@ int B_KeyForShortName(const char* key);
 } // extern "C"
 #endif
 
-#endif /// LIBDENG_BIND_MAIN_H
+#endif // LIBDENG_BIND_MAIN_H

doomsday/client/src/map/p_particle.cpp

@@ -1422,7 +1422,7 @@ static int findDefForGenerator(ptcgen_t *gen, void *parameters)
                 }
 #endif
             }
-            catch(Materials::Manifest::MissingMaterialError const &)
+            catch(MaterialManifest::MissingMaterialError const &)
             {} // Ignore this error.
             catch(Materials::NotFoundError const &)
             {} // Ignore this error.