Permalink
Browse files

Imported upstream 1.9.108

Signed-off-by: Stefan Naewe <stefan.naewe@atlas-elektronik.com>
  • Loading branch information...
1 parent 6867ab6 commit 3e3c500feb9144d2e347cae4bb54e7dc9ea97219 Stefan Naewe committed Aug 2, 2012
View
34 CHANGES.txt
@@ -2,7 +2,7 @@
STLSoft - Changes
; Created: 29th March 2002
-; Updated: 30th January 2011
+; Updated: 31st January 2011
============================================================================
@@ -18,6 +18,38 @@ STLSoft - Changes
============================================================================
+Changes for 1.9.108 (31st January 2011)
+
+Summary:
+========
+
+ * changed erroneously named new unixstl::/winstl::filesystem_traits method's name from invalid_handle_value() to invalid_file_handle_value()
+ * added third, defaulted, template parameter to stlsoft::frequency_map for specification of predicate
+
+
+Changes:
+========
+
+ STLSoft:
+ ========
+
+ ~ include/stlsoft/containers/frequency_map.hpp:
+ + added third, defaulted, template parameter, allowing specification of predicate
+
+ UNIXSTL:
+ ========
+
+ ~ include/unixstl/filesystem/filesystem_traits.hpp:
+ ~ changed erroneously named new method's name from invalid_handle_value() to invalid_file_handle_value()
+
+ WinSTL:
+ =======
+
+ ~ include/winstl/filesystem/filesystem_traits.hpp:
+ ~ changed erroneously named new method's name from invalid_handle_value() to invalid_file_handle_value()
+
+============================================================================
+
Changes for 1.9.107 (30th January 2011)
Summary:
View
9 HISTORY.txt
@@ -2,11 +2,18 @@
STLSoft - History
; Created: 29th March 2002
-; Updated: 30th January 2011
+; Updated: 31st January 2011
============================================================================
+31st January 2011 - 1.9.108 released
+------------------------------------
+
+ * changed erroneously named new unixstl::/winstl::filesystem_traits method's name from invalid_handle_value() to invalid_file_handle_value()
+ * added third, defaulted, template parameter to stlsoft::frequency_map for specification of predicate
+
+
30th January 2011 - 1.9.107 released
------------------------------------
View
12 INSTALL.txt
@@ -2,7 +2,7 @@
STLSoft - Install
; Created: 29th March 2002
-; Updated: 30th January 2011
+; Updated: 31st January 2011
============================================================================
@@ -11,16 +11,16 @@ STLSoft - Install
It is recommended that you define an STLSOFT environment variable.
For example, if you're using UNIX and you install
- to /usr/local/stlsoft/stlsoft-1.9.107 then you should set the environment
- variable STLSOFT to /usr/local/stlsoft/stlsoft-1.9.107 in which case the
+ to /usr/local/stlsoft/stlsoft-1.9.108 then you should set the environment
+ variable STLSOFT to /usr/local/stlsoft/stlsoft-1.9.108 in which case the
file stlsoft/stlsoft.h will be located in
$STLSOFT/include/stlsoft/stlsoft.h
Conversely, if you're using Windows and you intall
- to C:\3pty\STLSoft\stlsoft-1.9.107 then you should set the environment
- variable STLSoft to C:\3pty\STLSoft\stlsoft-1.9.107 in which case the
+ to C:\3pty\STLSoft\stlsoft-1.9.108 then you should set the environment
+ variable STLSoft to C:\3pty\STLSoft\stlsoft-1.9.108 in which case the
file stlsoft/stlsoft.h will be located in
- C:\3pty\STLSoft\stlsoft-1.9.107\stlsoft\stlsoft.h
+ C:\3pty\STLSoft\stlsoft-1.9.108\stlsoft\stlsoft.h
The makefiles / project files of several other open-source projects expect
this symbol, including:
View
4 NEWS.txt
@@ -2,13 +2,15 @@
STLSoft - News
; Created: 29th March 2002
-; Updated: 30th January 2011
+; Updated: 31st January 2011
============================================================================
News:
+ 31st January 2011 - Release of STLSoft 1.9.108
+
30th January 2011 - Release of STLSoft 1.9.107
28th December 2010 - Release of STLSoft 1.9.106
View
29 include/stlsoft/containers/frequency_map.hpp
@@ -4,11 +4,11 @@
* Purpose: A container that measures the frequency of the unique elements it contains.
*
* Created: 1st October 2005
- * Updated: 12th December 2010
+ * Updated: 31st January 2011
*
* Home: http://stlsoft.org/
*
- * Copyright (c) 2005-2010, Matthew Wilson and Synesis Software
+ * Copyright (c) 2005-2011, Matthew Wilson and Synesis Software
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -50,9 +50,9 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define STLSOFT_VER_STLSOFT_CONTAINERS_HPP_FREQUENCY_MAP_MAJOR 2
-# define STLSOFT_VER_STLSOFT_CONTAINERS_HPP_FREQUENCY_MAP_MINOR 3
+# define STLSOFT_VER_STLSOFT_CONTAINERS_HPP_FREQUENCY_MAP_MINOR 4
# define STLSOFT_VER_STLSOFT_CONTAINERS_HPP_FREQUENCY_MAP_REVISION 1
-# define STLSOFT_VER_STLSOFT_CONTAINERS_HPP_FREQUENCY_MAP_EDIT 25
+# define STLSOFT_VER_STLSOFT_CONTAINERS_HPP_FREQUENCY_MAP_EDIT 26
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
/* /////////////////////////////////////////////////////////////////////////
@@ -109,15 +109,16 @@ template< ss_typename_param_k T
#else
, ss_typename_param_k N = uint32_t
#endif
+ , ss_typename_param_k P = stlsoft_ns_qual_std(less)<T>
>
class frequency_map
: public stl_collection_tag
{
private: // Member Types
- typedef stlsoft_ns_qual_std(map)<T, N> map_type_;
+ typedef stlsoft_ns_qual_std(map)<T, N, P> map_type_;
public:
/// This type
- typedef frequency_map<T, N> class_type;
+ typedef frequency_map<T, N, P> class_type;
/// The value type
typedef ss_typename_param_k map_type_::value_type value_type;
/// The non-mutating (const) iterator type
@@ -333,13 +334,16 @@ class frequency_map
template< ss_typename_param_k T
, ss_typename_param_k N
+ , ss_typename_param_k P
>
-inline frequency_map<T, N> operator +(
- frequency_map<T, N> const& lhs
-, frequency_map<T, N> const& rhs
+inline
+frequency_map<T, N, P>
+operator +(
+ frequency_map<T, N, P> const& lhs
+, frequency_map<T, N, P> const& rhs
)
{
- frequency_map<T, N> r(lhs);
+ frequency_map<T, N, P> r(lhs);
r += rhs;
@@ -354,10 +358,11 @@ inline frequency_map<T, N> operator +(
template< ss_typename_param_k T
, ss_typename_param_k N
+ , ss_typename_param_k P
>
inline void swap(
- frequency_map<T, N>& lhs
-, frequency_map<T, N>& rhs
+ frequency_map<T, N, P>& lhs
+, frequency_map<T, N, P>& rhs
)
{
lhs.swap(rhs);
View
11 include/stlsoft/stlsoft.h
@@ -6,7 +6,7 @@
* types.
*
* Created: 15th January 2002
- * Updated: 30th January 2011
+ * Updated: 31st January 2011
*
* Home: http://stlsoft.org/
*
@@ -54,8 +54,8 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define STLSOFT_VER_STLSOFT_H_STLSOFT_MAJOR 3
# define STLSOFT_VER_STLSOFT_H_STLSOFT_MINOR 23
-# define STLSOFT_VER_STLSOFT_H_STLSOFT_REVISION 9
-# define STLSOFT_VER_STLSOFT_H_STLSOFT_EDIT 416
+# define STLSOFT_VER_STLSOFT_H_STLSOFT_REVISION 10
+# define STLSOFT_VER_STLSOFT_H_STLSOFT_EDIT 417
#else /* ? STLSOFT_DOCUMENTATION_SKIP_SECTION */
/* # include "./internal/doxygen_defs.h" */
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
@@ -270,12 +270,13 @@
# define _STLSOFT_VER_1_9_105 0x010969ff /*!< Version 1.9.105 (22nd December 2010) */
# define _STLSOFT_VER_1_9_106 0x01096aff /*!< Version 1.9.106 (28th December 2010) */
# define _STLSOFT_VER_1_9_107 0x01096bff /*!< Version 1.9.107 (30th January 2011) */
+# define _STLSOFT_VER_1_9_108 0x01096cff /*!< Version 1.9.108 (31st January 2011) */
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
#define _STLSOFT_VER_MAJOR 1
#define _STLSOFT_VER_MINOR 9
-#define _STLSOFT_VER_REVISION 107
-#define _STLSOFT_VER _STLSOFT_VER_1_9_107
+#define _STLSOFT_VER_REVISION 108
+#define _STLSOFT_VER _STLSOFT_VER_1_9_108
/* /////////////////////////////////////////////////////////////////////////
* Basic macros
View
10 include/unixstl/filesystem/filesystem_traits.hpp
@@ -5,7 +5,7 @@
* Unicode specialisations thereof.
*
* Created: 15th November 2002
- * Updated: 25th January 2011
+ * Updated: 31st January 2011
*
* Thanks: To Sergey Nikulov, for spotting a pre-processor typo that
* broke GCC -pedantic
@@ -55,9 +55,9 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_MAJOR 4
-# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_MINOR 6
+# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_MINOR 7
# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_REVISION 1
-# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_EDIT 115
+# define UNIXSTL_VER_UNIXSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_EDIT 116
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
/* /////////////////////////////////////////////////////////////////////////
@@ -384,7 +384,7 @@ struct filesystem_traits
/// The value returned by open_file() that indicates that the
/// operation failed
- static file_handle_type invalid_handle_value();
+ static file_handle_type invalid_file_handle_value();
/// \brief Create / open a file
static file_handle_type open_file(char_type const* fileName, int oflag, int pmode);
/// \brief Closes the given operating system handle
@@ -1153,7 +1153,7 @@ struct filesystem_traits<us_char_a_t>
# pragma warning(disable : 4996)
#endif /* compiler */
- static file_handle_type invalid_handle_value()
+ static file_handle_type invalid_file_handle_value()
{
return NULL;
}
View
19 include/unixstl/unixstl.h
@@ -5,11 +5,11 @@
* and platform discriminations, and definitions of types.
*
* Created: 15th January 2002
- * Updated: 5th February 2010
+ * Updated: 31st January 2011
*
* Home: http://stlsoft.org/
*
- * Copyright (c) 2002-2010, Matthew Wilson and Synesis Software
+ * Copyright (c) 2002-2011, Matthew Wilson and Synesis Software
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -47,8 +47,8 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_MAJOR 3
# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_MINOR 7
-# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_REVISION 2
-# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_EDIT 89
+# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_REVISION 3
+# define UNIXSTL_VER_UNIXSTL_H_UNIXSTL_EDIT 90
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
/** \file unixstl/unixstl.h \brief [C, C++] The root header for the \ref group__project__unixstl "UNIXSTL" project. */
@@ -124,13 +124,14 @@
# define _UNIXSTL_VER_1_6_8 0x010608ff /*!< Version 1.6.8 (with STLSoft 1.9.32) */
# define _UNIXSTL_VER_1_7_1 0x010701ff /*!< Version 1.7.1 (with STLSoft 1.9.33) */
# define _UNIXSTL_VER_1_7_2 0x010702ff /*!< Version 1.7.2 (with STLSoft 1.9.37) */
-# define _UNIXSTL_VER_1_7_3 0x010703ff /*!< Version 1.7.2 (with STLSoft 1.9.92) */
+# define _UNIXSTL_VER_1_7_3 0x010703ff /*!< Version 1.7.3 (with STLSoft 1.9.92) */
+# define _UNIXSTL_VER_1_7_4 0x010704ff /*!< Version 1.7.4 (with STLSoft 1.9.108) */
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
#define _UNIXSTL_VER_MAJOR 1
#define _UNIXSTL_VER_MINOR 7
-#define _UNIXSTL_VER_REVISION 3
-#define _UNIXSTL_VER _UNIXSTL_VER_1_7_3
+#define _UNIXSTL_VER_REVISION 4
+#define _UNIXSTL_VER _UNIXSTL_VER_1_7_4
/* /////////////////////////////////////////////////////////////////////////
* Includes
@@ -145,8 +146,8 @@
*/
#if !defined(_STLSOFT_VER) || \
- _STLSOFT_VER < 0x01095cff
-# error This version of the UNIXSTL libraries requires STLSoft version 1.9.92, or later
+ _STLSOFT_VER < 0x01096cff
+# error This version of the UNIXSTL libraries requires STLSoft version 1.9.108, or later
#endif /* _STLSOFT_VER */
/* /////////////////////////////////////////////////////////////////////////
View
12 include/winstl/filesystem/filesystem_traits.hpp
@@ -5,7 +5,7 @@
* Unicode specialisations thereof.
*
* Created: 15th November 2002
- * Updated: 25th January 2011
+ * Updated: 31st January 2011
*
* Home: http://stlsoft.org/
*
@@ -52,9 +52,9 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_MAJOR 4
-# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_MINOR 8
+# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_MINOR 9
# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_REVISION 1
-# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_EDIT 124
+# define WINSTL_VER_WINSTL_FILESYSTEM_HPP_FILESYSTEM_TRAITS_EDIT 125
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
/* /////////////////////////////////////////////////////////////////////////
@@ -433,7 +433,7 @@ struct filesystem_traits
/// The value returned by create_file() that indicates that the
/// operation failed
- static file_handle_type invalid_handle_value();
+ static file_handle_type invalid_file_handle_value();
/// \brief Create / open a file
static file_handle_type create_file(char_type const* fileName, size_type desiredAccess, size_type shareMode, LPSECURITY_ATTRIBUTES sa, size_type creationDisposition, size_type flagAndAttributes, HANDLE hTemplateFile);
/// \brief Closes the given file handle
@@ -1283,7 +1283,7 @@ struct filesystem_traits<ws_char_a_t>
return FALSE != ::CopyFileA(sourceName, newName, bFailIfExists);
}
- static file_handle_type invalid_handle_value()
+ static file_handle_type invalid_file_handle_value()
{
return INVALID_HANDLE_VALUE;
}
@@ -1924,7 +1924,7 @@ struct filesystem_traits<ws_char_w_t>
return FALSE != ::CopyFileW(sourceName, newName, bFailIfExists);
}
- static file_handle_type invalid_handle_value()
+ static file_handle_type invalid_file_handle_value()
{
return INVALID_HANDLE_VALUE;
}
View
15 include/winstl/winstl.h
@@ -5,7 +5,7 @@
* and platform discriminations, and definitions of types.
*
* Created: 15th January 2002
- * Updated: 5th January 2011
+ * Updated: 31st January 2011
*
* Home: http://stlsoft.org/
*
@@ -48,8 +48,8 @@
#ifndef STLSOFT_DOCUMENTATION_SKIP_SECTION
# define WINSTL_VER_WINSTL_H_WINSTL_MAJOR 3
# define WINSTL_VER_WINSTL_H_WINSTL_MINOR 12
-# define WINSTL_VER_WINSTL_H_WINSTL_REVISION 4
-# define WINSTL_VER_WINSTL_H_WINSTL_EDIT 185
+# define WINSTL_VER_WINSTL_H_WINSTL_REVISION 5
+# define WINSTL_VER_WINSTL_H_WINSTL_EDIT 186
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
/** \file winstl/winstl.h
@@ -148,12 +148,13 @@
# define _WINSTL_VER_1_11_3 0x010b03ff /*!< Version 1.11.3 (with STLSoft 1.9.101) */
# define _WINSTL_VER_1_11_4 0x010b04ff /*!< Version 1.11.4 (with STLSoft 1.9.105) */
# define _WINSTL_VER_1_11_5 0x010b05ff /*!< Version 1.11.5 (with STLSoft 1.9.107) */
+# define _WINSTL_VER_1_11_6 0x010b06ff /*!< Version 1.11.6 (with STLSoft 1.9.108) */
#endif /* !STLSOFT_DOCUMENTATION_SKIP_SECTION */
#define _WINSTL_VER_MAJOR 1
#define _WINSTL_VER_MINOR 11
-#define _WINSTL_VER_REVISION 5
-#define _WINSTL_VER _WINSTL_VER_1_11_5
+#define _WINSTL_VER_REVISION 6
+#define _WINSTL_VER _WINSTL_VER_1_11_6
/* /////////////////////////////////////////////////////////////////////////
* Includes
@@ -224,8 +225,8 @@
*/
#if !defined(_STLSOFT_VER) || \
- _STLSOFT_VER < 0x010969ff
-# error This version of the WinSTL libraries requires STLSoft version 1.9.105, or later
+ _STLSOFT_VER < 0x01096cff
+# error This version of the WinSTL libraries requires STLSoft version 1.9.108, or later
#endif /* _STLSOFT_VER */
/* /////////////////////////////////////////////////////////////////////////

0 comments on commit 3e3c500

Please sign in to comment.