Author: sapient
Date: Fri Apr 13 07:38:56 2007
New Revision: 16802
URL: http://svn.gna.org/viewcvs/wesnoth?rev=16802&view=rev
Log:
quick hack to prevent template re-instatiation
Modified:
trunk/src/unit_frame.cpp
trunk/src/unit_frame.hpp
Modified: trunk/src/unit_frame.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_frame.cpp?rev=16802&r1=16801&r2=16802&view=diff
==============================================================================
--- trunk/src/unit_frame.cpp (original)
+++ trunk/src/unit_frame.cpp Fri Apr 13 07:38:56 2007
@@ -14,6 +14,7 @@
#include "display.hpp"
#include "global.hpp"
+#define UNIT_FRAME_H_PART2
#include "unit_frame.hpp"
@@ -135,6 +136,9 @@
// Force compilation of the following template instantiations
template class progressive_<int>;
template class progressive_<double>;
+
+#undef UNIT_FRAME_H_PART2
+#include "unit_frame.hpp"
unit_frame::unit_frame() :
image_(), image_diagonal_(),halo_(), sound_(),
Modified: trunk/src/unit_frame.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/unit_frame.hpp?rev=16802&r1=16801&r2=16802&view=diff
==============================================================================
--- trunk/src/unit_frame.hpp (original)
+++ trunk/src/unit_frame.hpp Fri Apr 13 07:38:56 2007
@@ -48,6 +48,10 @@
typedef progressive_<int> progressive_int;
typedef progressive_<double> progressive_double;
+#endif
+#ifndef UNIT_FRAME_H_PART2
+#define UNIT_FRAME_H_PART2
+
//a class to describe a unit's animation sequence
class unit_frame {
public:
_______________________________________________
Wesnoth-commits mailing list
[EMAIL PROTECTED]
https://mail.gna.org/listinfo/wesnoth-commits
