Detect mode_t for safe use of chmod, and for scons/msvc

[lyx.git] / src / support / types.h

diff --git a/src/support/types.h b/src/support/types.h
index 92077fa7cb15515d4f2dcd9298c6ffc6f9326569..446aa3d60f94ee09173ee90093354d00f983f914 100644 (file)
--- a/src/support/types.h
+++ b/src/support/types.h
@@ -16,26 +16,44 @@
 #ifndef LYX_TYPES_H
 #define LYX_TYPES_H
 
-// this probably could be improved by using <cstddef>...
-#include <vector>
+#include <boost/cstdint.hpp>
+
+#include <cstddef>
+
+namespace lyx {
+
+       /// The type used to hold characters in paragraphs
+#if defined(HAVE_WCHAR_T) && SIZEOF_WCHAR_T == 4
+       // Prefer this if possible because GNU libstdc++ has usable
+       // std::ctype<wchar_t> locale facets but not
+       // std::ctype<boost::uint32_t>. gcc older than 3.4 is also missing
+       // usable std::char_traits<boost::uint32_t>.
+       typedef wchar_t char_type;
+#else
+       typedef boost::uint32_t char_type;
+#endif
 
-namespace lyx
-{
        /// a type for positions used in paragraphs
        // needs to be signed for a while to hold the special value -1 that is
-       // used there...
-       typedef std::vector<char>::difference_type   pos_type;
+       // used there
+       typedef ptrdiff_t  pos_type;
+
+       /// a type for paragraph offsets
+       // FIXME: should be unsigned as well.
+       // however, simply changing it breaks a downward loop somewhere...
+       typedef ptrdiff_t  pit_type;
 
+       /// a type for the nesting depth of a paragraph
+       typedef size_t     depth_type;
 
 // set this to '0' if you want to have really safe types
 #if 1
 
        /// a type for sizes
-       typedef std::vector<char>::size_type         size_type;
+       typedef size_t     size_type;
 
        /// a type used for numbering text classes
-       // used to be LyXTextClassList::size_type
-       typedef std::vector<char>::size_type         textclass_type;
+       typedef size_t     textclass_type;
 
 #else
 
@@ -45,7 +63,7 @@ namespace lyx
 
        struct size_type {
                ///
-               typedef std::vector<char>::size_type  base_type;
+               typedef size_t  base_type;
                ///
                size_type(base_type t) { data_ = t; }
                ///
@@ -57,7 +75,7 @@ namespace lyx
 
        struct textclass_type {
                ///
-               typedef std::vector<char>::size_type  base_type;
+               typedef size_t   base_type;
                ///
                textclass_type(base_type t) { data_ = t; }
                ///
@@ -85,6 +103,6 @@ namespace lyx
                NEXT_WORD
        };
 
-}
+} // namespace lyx
 
 #endif // LYX_TYPES_H