From b10815afab0e9ea7d74798cabcf8ed2286abaf82 Mon Sep 17 00:00:00 2001 From: David Rose Date: Fri, 16 Mar 2007 17:25:02 +0000 Subject: [PATCH] more gcc warnings --- panda/src/gobj/shaderExpansion.I | 2 +- panda/src/gobj/shaderExpansion.cxx | 4 ++-- panda/src/gobj/shaderExpansion.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/panda/src/gobj/shaderExpansion.I b/panda/src/gobj/shaderExpansion.I index d0235f6fc6..fb29ddfab4 100644 --- a/panda/src/gobj/shaderExpansion.I +++ b/panda/src/gobj/shaderExpansion.I @@ -101,4 +101,4 @@ operator == (const ShaderCaps &other) const { } #endif return true; -} \ No newline at end of file +} diff --git a/panda/src/gobj/shaderExpansion.cxx b/panda/src/gobj/shaderExpansion.cxx index 65f0ab3aaa..a5fb591c48 100644 --- a/panda/src/gobj/shaderExpansion.cxx +++ b/panda/src/gobj/shaderExpansion.cxx @@ -1137,9 +1137,9 @@ ShaderExpansion(const string &name, const string &text, const ShaderCaps &caps) : _name(name), _text(text), - _parse(0), _header(""), - _error_flag(true) + _error_flag(true), + _parse(0) { string header; parse_init(); diff --git a/panda/src/gobj/shaderExpansion.h b/panda/src/gobj/shaderExpansion.h index 2d107aca43..3ed4dbd9cd 100644 --- a/panda/src/gobj/shaderExpansion.h +++ b/panda/src/gobj/shaderExpansion.h @@ -181,7 +181,7 @@ public: int _active_fprofile; int _ultimate_vprofile; int _ultimate_fprofile; -#endif; +#endif INLINE void clear(); INLINE bool operator == (const ShaderCaps &other) const; INLINE ShaderCaps();