mail[Wesnoth-commits] r44568 - in /trunk/src: tstring.cpp tstring.hpp


Others Months | Index by Date | Thread Index
>>   [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Header


Content

Posted by guillaume . melquiond on July 23, 2010 - 08:31:
Author: silene
Date: Fri Jul 23 08:31:24 2010
New Revision: 44568

URL: http://svn.gna.org/viewcvs/wesnoth?rev=44568&view=rev
Log:
Limited r44567 to MSVC only.

Modified:
    trunk/src/tstring.cpp
    trunk/src/tstring.hpp

Modified: trunk/src/tstring.cpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tstring.cpp?rev=44568&r1=44567&r2=44568&view=diff
==============================================================================
--- trunk/src/tstring.cpp (original)
+++ trunk/src/tstring.cpp Fri Jul 23 08:31:24 2010
@@ -53,6 +53,7 @@
        return seed;
 }
 
+#ifdef _MSC_VER
 t_string_base::walker::walker(const t_string& string) :
        string_(string.get().value_),
        begin_(0),
@@ -64,6 +65,7 @@
                update();
        }
 }
+#endif
 
 t_string_base::walker::walker(const t_string_base& string) :
        string_(string.value_),
@@ -77,6 +79,7 @@
        }
 }
 
+#ifdef _MSC_VER
 t_string_base::walker::walker(const std::string& string) :
        string_(string),
        begin_(0),
@@ -86,6 +89,7 @@
 {
        update();
 }
+#endif
 
 void t_string_base::walker::update()
 {

Modified: trunk/src/tstring.hpp
URL: 
http://svn.gna.org/viewcvs/wesnoth/trunk/src/tstring.hpp?rev=44568&r1=44567&r2=44568&view=diff
==============================================================================
--- trunk/src/tstring.hpp (original)
+++ trunk/src/tstring.hpp Fri Jul 23 08:31:24 2010
@@ -30,8 +30,11 @@
        {
        public:
                walker(const t_string_base& string);
+#ifdef _MSC_VER
+               // Work around a compiler bug in MSVC 9.
                explicit walker(const std::string&);
                walker(const t_string& string);
+#endif
                void next()                               { begin_ = end_; 
update(); }
                bool eos() const                          { return begin_ == 
string_.size(); }
                bool last() const                         { return end_ == 
string_.size(); }




Related Messages


Powered by MHonArc, Updated Fri Jul 23 10:20:14 2010