summaryrefslogtreecommitdiff
path: root/boost/archive/iterators
diff options
context:
space:
mode:
Diffstat (limited to 'boost/archive/iterators')
-rw-r--r--boost/archive/iterators/base64_from_binary.hpp2
-rw-r--r--boost/archive/iterators/binary_from_base64.hpp2
-rw-r--r--boost/archive/iterators/escape.hpp3
-rw-r--r--boost/archive/iterators/istream_iterator.hpp6
-rw-r--r--boost/archive/iterators/mb_from_wchar.hpp3
-rw-r--r--boost/archive/iterators/transform_width.hpp1
-rw-r--r--boost/archive/iterators/wchar_from_mb.hpp2
7 files changed, 12 insertions, 7 deletions
diff --git a/boost/archive/iterators/base64_from_binary.hpp b/boost/archive/iterators/base64_from_binary.hpp
index 00c4e10c10..ee84994439 100644
--- a/boost/archive/iterators/base64_from_binary.hpp
+++ b/boost/archive/iterators/base64_from_binary.hpp
@@ -41,7 +41,7 @@ template<class CharType>
struct from_6_bit {
typedef CharType result_type;
CharType operator()(CharType t) const{
- const char * lookup_table =
+ static const char * lookup_table =
"ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz"
"0123456789"
diff --git a/boost/archive/iterators/binary_from_base64.hpp b/boost/archive/iterators/binary_from_base64.hpp
index 2eb7828251..89b8f889da 100644
--- a/boost/archive/iterators/binary_from_base64.hpp
+++ b/boost/archive/iterators/binary_from_base64.hpp
@@ -37,7 +37,7 @@ template<class CharType>
struct to_6_bit {
typedef CharType result_type;
CharType operator()(CharType t) const{
- const signed char lookup_table[] = {
+ static const signed char lookup_table[] = {
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,
-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63,
diff --git a/boost/archive/iterators/escape.hpp b/boost/archive/iterators/escape.hpp
index a1fee91420..103b31e0fe 100644
--- a/boost/archive/iterators/escape.hpp
+++ b/boost/archive/iterators/escape.hpp
@@ -102,7 +102,8 @@ public:
super_t(base),
m_bnext(NULL),
m_bend(NULL),
- m_full(false)
+ m_full(false),
+ m_current_value(0)
{
}
};
diff --git a/boost/archive/iterators/istream_iterator.hpp b/boost/archive/iterators/istream_iterator.hpp
index 9a1d555c10..a187f605e6 100644
--- a/boost/archive/iterators/istream_iterator.hpp
+++ b/boost/archive/iterators/istream_iterator.hpp
@@ -56,7 +56,7 @@ class istream_iterator :
//Access the value referred to
Elem dereference() const {
- return m_istream->peek();
+ return static_cast<Elem>(m_istream->peek());
}
void increment(){
@@ -75,14 +75,14 @@ public:
}
istream_iterator() :
- m_istream(NULL)
+ m_istream(NULL),
+ m_current_value(NULL)
{}
istream_iterator(const istream_iterator<Elem> & rhs) :
m_istream(rhs.m_istream),
m_current_value(rhs.m_current_value)
{}
-
};
} // namespace iterators
diff --git a/boost/archive/iterators/mb_from_wchar.hpp b/boost/archive/iterators/mb_from_wchar.hpp
index b6dc9b2151..05df71c258 100644
--- a/boost/archive/iterators/mb_from_wchar.hpp
+++ b/boost/archive/iterators/mb_from_wchar.hpp
@@ -18,8 +18,9 @@
#include <boost/assert.hpp>
#include <cstddef> // size_t
+#ifndef BOOST_NO_CWCHAR
#include <cwchar> // mbstate_t
-
+#endif
#include <boost/config.hpp>
#if defined(BOOST_NO_STDC_NAMESPACE)
namespace std{
diff --git a/boost/archive/iterators/transform_width.hpp b/boost/archive/iterators/transform_width.hpp
index d042560e29..09c050a927 100644
--- a/boost/archive/iterators/transform_width.hpp
+++ b/boost/archive/iterators/transform_width.hpp
@@ -111,6 +111,7 @@ public:
transform_width(T start) :
super_t(Base(static_cast< T >(start))),
m_buffer_out_full(false),
+ m_buffer_out(0),
// To disable GCC warning, but not truly necessary
//(m_buffer_in will be initialized later before being
//used because m_remaining_bits == 0)
diff --git a/boost/archive/iterators/wchar_from_mb.hpp b/boost/archive/iterators/wchar_from_mb.hpp
index 52a44bdc79..2af8f6401f 100644
--- a/boost/archive/iterators/wchar_from_mb.hpp
+++ b/boost/archive/iterators/wchar_from_mb.hpp
@@ -19,7 +19,9 @@
#include <boost/assert.hpp>
#include <cctype>
#include <cstddef> // size_t
+#ifndef BOOST_NO_CWCHAR
#include <cwchar> // mbstate_t
+#endif
#include <algorithm> // copy
#include <boost/config.hpp>