Commit MetaInfo

Revision3033726fb7f3ca205cd3754bfefd1ad2160aebc3 (tree)
Time2013-05-12 12:28:25
Author <exeal@user...>

Log Message

Removed alpha.hpp header file.

Change Summary

Incremental Difference

diff -r cb900322ded3 -r 3033726fb7f3 alpha/src/alpha.hpp
--- a/alpha/src/alpha.hpp Sun May 12 12:26:38 2013 +0900
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
1-/**
2- * @file alpha.hpp
3- */
4-
5-#include <manah/memory.hpp>
6-#include <manah/win32/windows.hpp>
7-
8-namespace alpha {
9- manah::AutoBuffer<WCHAR> a2u(const char* first, const char* last, DWORD flags = MB_PRECOMPOSED);
10- manah::AutoBuffer<char> u2a(const WCHAR* first, const WCHAR* last, DWORD flags = 0);
11-}
12-
13-// std.min と std.max の補完 (VC6 + NOMINMAX 用)
14-#if(_MSC_VER < 1300)
15-namespace std {
16- template<typename T> inline const T& max(const T& a1, const T& a2) {return (a1 < a2) ? a2 : a1;}
17- template<typename T, typename Pr> inline const T& max(const T& a1, const T& a2, Pr pred) {return pred(a1, a2) ? a2 : a1;}
18- template<typename T> inline const T& min(const T& a1, const T& a2) {return (a2 < a1) ? a2 : a1;}
19- template<typename T, typename Pr> inline const T& min(const T& a1, const T& a2, Pr pred) {return pred(a2, a1) ? a2 : a1;}
20- typedef unsigned int size_t;
21-}
22-#endif // _MSC_VER < 1300
23-
24-#pragma warning(disable: 4503) // 「装飾された名前の長さが限界を越えました」(1)
25-#pragma warning(disable: 4786) // 「識別子は 'number' 文字に切り詰められました」(3)
26-
27-#ifdef _DEBUG
28-# define ALERT(msg) ::MessageBoxW(0, (msg), L"Debug alert", MB_ICONEXCLAMATION);
29-#else
30-# define ALERT(msg)
31-#endif // _DEBUG
32-
33-// for スコープ (VC6 用。VC7 では /Zc:forScope を使う)
34-#if(_MSC_VER < 1300)
35-# define for if(0); else for
36-#endif
diff -r cb900322ded3 -r 3033726fb7f3 ascension/ascension/win32/windows.hpp
--- a/ascension/ascension/win32/windows.hpp Sun May 12 12:26:38 2013 +0900
+++ b/ascension/ascension/win32/windows.hpp Sun May 12 12:28:25 2013 +0900
@@ -1,6 +1,7 @@
11 /**
22 * @file windows.hpp
3- * @date 2006-2012 exeal
3+ * @author exeal
4+ * @date 2006-2013
45 */
56
67 #ifndef ASCENSION_WIN32_WINDOWS_HPP
@@ -162,7 +163,21 @@
162163 }
163164
164165
165-// macros ///////////////////////////////////////////////////////////////////
166+// macros ///////////////////////////////////////////////////////////////////
167+
168+#if(_MSC_VER < 1300 && 0)
169+// for MSVC6 + NOMINMAX
170+namespace std {
171+ template<typename T> inline const T& max(const T& a1, const T& a2) {return (a1 < a2) ? a2 : a1;}
172+ template<typename T, typename Pr> inline const T& max(const T& a1, const T& a2, Pr pred) {return pred(a1, a2) ? a2 : a1;}
173+ template<typename T> inline const T& min(const T& a1, const T& a2) {return (a2 < a1) ? a2 : a1;}
174+ template<typename T, typename Pr> inline const T& min(const T& a1, const T& a2, Pr pred) {return pred(a2, a1) ? a2 : a1;}
175+ typedef unsigned int size_t;
176+}
177+
178+// for MSVC6 which can't use "/Zc:forScope"
179+# define for if(0); else for
180+#endif
166181
167182 // sizeof(MENUITEMINFO)
168183 #if(WINVER >= 0x0500 && !defined(MENUITEMINFO_SIZE_VERSION_400))
Show on old repository browser