Author: mordante
Date: Sat Apr 25 22:46:26 2009
New Revision: 35218
URL: http://svn.gna.org/viewcvs/wesnoth?rev=35218&view=rev
Log:
Remove the old copy policy code.
The ttext is no longer copyable and it's no longer needed, so remove
that option.
Modified:
trunk/src/text.cpp
trunk/src/text.hpp
Modified: trunk/src/text.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/text.cpp?rev=35218&r1=35217&r2=35218&view=diff
==============================================================================
--- trunk/src/text.cpp (original)
+++ trunk/src/text.cpp Sat Apr 25 22:46:26 2009
@@ -23,8 +23,6 @@
#include <cstring>
namespace font {
-
-namespace internal {
namespace {
@@ -541,7 +539,5 @@
memset(surface_buffer_, 0, size);
}
-} // namespace internal
-
} // namespace font
Modified: trunk/src/text.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/text.hpp?rev=35218&r1=35217&r2=35218&view=diff
==============================================================================
--- trunk/src/text.hpp (original)
+++ trunk/src/text.hpp Sat Apr 25 22:46:26 2009
@@ -35,12 +35,6 @@
// add background colour and also font markup.
-/**
- * The classes in this namespace should not be used directly.
- *
- * Use the typedef which sets the policy instead.
- */
-namespace internal {
/**
* Text class.
*
@@ -278,26 +272,7 @@
void create_surface_buffer(const size_t size) const;
};
-} // namespace internal
-
-
-/**
- * Note the deepcopy might not be used on all compilers due to RVO [1].
- * This means the code might be less tested, gcc does this optimization and
- * thus I didn't test it on my platform -- Mordante.
- *
- * [1] http://www.parashift.com/c++-faq-lite/ctors.html#faq-10.9
- */
-//typedef policies::tcopy_policy<internal::ttext, policies::tdeep_copy> ttext;
-
-/**
- * Due to changes to the widgets the copying of a ttext object is no longer
- * needed so just made the base itself not copyable. For now keep a typedef.
- *
- * @todo once stable clean up this header.
- */
-typedef internal::ttext ttext;
-
} // namespace font
#endif
+
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
