[Gnash-commit] /srv/bzr/gnash/trunk r11540: <clocale> is only for setlocale. Restore <locale> where it's for

[Benjamin Wolsey]

------------------------------------------------------------
revno: 11540
committer: Benjamin Wolsey <address@hidden>
branch nick: trunk
timestamp: Fri 2009-10-02 10:18:58 +0200
message:
  <clocale> is only for setlocale. Restore <locale> where it's for
  C++ locale objects. Drop from ASHandlers.cpp, where it's not needed anyway.
  The encoding-guessing code it was probably intended for doesn't use it.
modified:
  libcore/as_value.cpp
  libcore/asobj/String_as.cpp
  libcore/vm/ASHandlers.cpp

=== modified file 'libcore/as_value.cpp'
--- a/libcore/as_value.cpp      2009-10-01 23:46:57 +0000
+++ b/libcore/as_value.cpp      2009-10-02 08:18:58 +0000
@@ -46,7 +46,7 @@
 #include <boost/algorithm/string/case_conv.hpp>
 #include <boost/lexical_cast.hpp>
 #include <boost/format.hpp>
-#include <clocale>
+#include <locale>
 #include <sstream>
 #include <iomanip>
 #include <string>

=== modified file 'libcore/asobj/String_as.cpp'
--- a/libcore/asobj/String_as.cpp       2009-10-01 23:46:57 +0000
+++ b/libcore/asobj/String_as.cpp       2009-10-02 08:18:58 +0000
@@ -42,7 +42,7 @@
 
 #include <boost/algorithm/string/case_conv.hpp>
 #include <algorithm>
-#include <clocale>
+#include <locale>
 #include <stdexcept>
 
 namespace gnash {

=== modified file 'libcore/vm/ASHandlers.cpp'
--- a/libcore/vm/ASHandlers.cpp 2009-10-01 23:46:57 +0000
+++ b/libcore/vm/ASHandlers.cpp 2009-10-02 08:18:58 +0000
@@ -52,7 +52,6 @@
 
 #include <string>
 #include <vector>
-#include <clocale>
 #include <cstdlib> // std::mbstowcs
 #include <boost/scoped_array.hpp>
 #include <boost/random.hpp>