[ros-kernel] Explorer and GCC 3.4.1
Filip Navara
xnavara at volny.cz
Mon Jul 19 00:21:09 CEST 2004
Hello,
the attached patch gets the Explorer in ReactOS CVS compiling with the
just released GCC 3.4.1. It removes the "use namespace std;" thing and
replaces it with proper "std::" prefixes. Please consider if it should
be commited to CVS.
Regards,
Filip
-------------- next part --------------
Index: subsys/system/explorer/globals.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/globals.h,v
retrieving revision 1.39
diff -u -r1.39 globals.h
--- subsys/system/explorer/globals.h 9 Apr 2004 19:42:20 -0000 1.39
+++ subsys/system/explorer/globals.h 18 Jul 2004 21:02:44 -0000
@@ -40,9 +40,9 @@
bool _neverShowExt;
};
-struct FileTypeManager : public map<String, FileTypeInfo>
+struct FileTypeManager : public std::map<String, FileTypeInfo>
{
- typedef map<String, FileTypeInfo> super;
+ typedef std::map<String, FileTypeInfo> super;
const FileTypeInfo& operator[](String ext);
@@ -133,14 +133,14 @@
protected:
static int s_next_id;
- typedef map<int, Icon> IconMap;
+ typedef std::map<int, Icon> IconMap;
IconMap _icons;
- typedef map<String, ICON_ID> PathMap;
+ typedef std::map<String, ICON_ID> PathMap;
PathMap _pathMap;
- typedef pair<String, int> CachePair;
- typedef map<CachePair, ICON_ID> PathIdxMap;
+ typedef std::pair<String, int> CachePair;
+ typedef std::map<CachePair, ICON_ID> PathIdxMap;
PathIdxMap _pathIdxMap;
HIMAGELIST _himlSys;
@@ -193,13 +193,13 @@
#else
-typedef pair<HWND, DWORD> MinimizeStruct;
+typedef std::pair<HWND, DWORD> MinimizeStruct;
struct Desktop
{
- set<HWND> _windows;
+ std::set<HWND> _windows;
WindowHandle _hwndForeground;
- list<MinimizeStruct> _minimized;
+ std::list<MinimizeStruct> _minimized;
};
typedef Desktop DesktopRef;
Index: subsys/system/explorer/desktop/desktop.cpp
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/desktop/desktop.cpp,v
retrieving revision 1.63
diff -u -r1.63 desktop.cpp
--- subsys/system/explorer/desktop/desktop.cpp 18 Jun 2004 16:35:59 -0000 1.63
+++ subsys/system/explorer/desktop/desktop.cpp 18 Jul 2004 21:02:46 -0000
@@ -210,7 +210,7 @@
static BOOL CALLBACK MinimizeDesktopEnumFct(HWND hwnd, LPARAM lparam)
{
- list<MinimizeStruct>& minimized = *(list<MinimizeStruct>*)lparam;
+ std::list<MinimizeStruct>& minimized = *(std::list<MinimizeStruct>*)lparam;
if (IsWindowVisible(hwnd))
if (hwnd!=g_Globals._hwndDesktopBar && hwnd!=g_Globals._hwndDesktop)
@@ -225,12 +225,12 @@
/// minimize/restore all windows on the desktop
void Desktops::ToggleMinimize()
{
- list<MinimizeStruct>& minimized = (*this)[_current_desktop]._minimized;
+ std::list<MinimizeStruct>& minimized = (*this)[_current_desktop]._minimized;
if (minimized.empty()) {
EnumWindows(MinimizeDesktopEnumFct, (LPARAM)&minimized);
} else {
- for(list<MinimizeStruct>::const_iterator it=minimized.begin(); it!=minimized.end(); ++it)
+ for(std::list<MinimizeStruct>::const_iterator it=minimized.begin(); it!=minimized.end(); ++it)
ShowWindowAsync(it->first, it->second&WS_MAXIMIZE? SW_MAXIMIZE: SW_RESTORE);
minimized.clear();
@@ -710,8 +710,8 @@
{ 0, +1} // down
};
-typedef pair<int,int> IconPos;
-typedef map<IconPos, int> IconMap;
+typedef std::pair<int,int> IconPos;
+typedef std::map<IconPos, int> IconMap;
void DesktopShellView::PositionIcons(int dir)
{
Index: subsys/system/explorer/dialogs/searchprogram.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/dialogs/searchprogram.h,v
retrieving revision 1.15
diff -u -r1.15 searchprogram.h
--- subsys/system/explorer/dialogs/searchprogram.h 10 Apr 2004 20:31:18 -0000 1.15
+++ subsys/system/explorer/dialogs/searchprogram.h 18 Jul 2004 21:02:46 -0000
@@ -29,7 +29,7 @@
typedef void (*COLLECT_CALLBACK)(Entry* entry, void* param);
-typedef stack<ShellDirectory*> ShellDirectoryStack;
+typedef std::stack<ShellDirectory*> ShellDirectoryStack;
/// Thread for collecting start menu entries
struct CollectProgramsThread : public Thread
@@ -71,7 +71,7 @@
String _path;
};
-typedef list<FPDEntry> FPDCache;
+typedef std::list<FPDEntry> FPDCache;
/// Dialog to work with the complete list of start menu entries
Index: subsys/system/explorer/shell/mainframe.cpp
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/shell/mainframe.cpp,v
retrieving revision 1.66
diff -u -r1.66 mainframe.cpp
--- subsys/system/explorer/shell/mainframe.cpp 18 Jun 2004 16:36:00 -0000 1.66
+++ subsys/system/explorer/shell/mainframe.cpp 18 Jul 2004 21:02:50 -0000
@@ -1554,7 +1554,7 @@
}
}
- _shellBrowser = auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _left_hwnd, _right_hwnd,
+ _shellBrowser = std::auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _left_hwnd, _right_hwnd,
_shellpath_info, _himlSmall, this));
_shellBrowser->Init(_hwnd);
Index: subsys/system/explorer/shell/shellbrowser.cpp
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/shell/shellbrowser.cpp,v
retrieving revision 1.49
diff -u -r1.49 shellbrowser.cpp
--- subsys/system/explorer/shell/shellbrowser.cpp 20 Jun 2004 12:10:45 -0000 1.49
+++ subsys/system/explorer/shell/shellbrowser.cpp 18 Jul 2004 21:02:52 -0000
@@ -592,7 +592,7 @@
}
}
- _shellBrowser = auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _left_hwnd, _right_hwnd,
+ _shellBrowser = std::auto_ptr<ShellBrowser>(new ShellBrowser(_hwnd, _left_hwnd, _right_hwnd,
_shellpath_info, _himlSmall, this));
_shellBrowser->Init(_hwndFrame);
Index: subsys/system/explorer/shell/shellbrowser.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/shell/shellbrowser.h,v
retrieving revision 1.26
diff -u -r1.26 shellbrowser.h
--- subsys/system/explorer/shell/shellbrowser.h 31 May 2004 22:39:12 -0000 1.26
+++ subsys/system/explorer/shell/shellbrowser.h 18 Jul 2004 21:02:52 -0000
@@ -194,7 +194,7 @@
// HIMAGELIST _himlLarge; // shell image
protected:
- auto_ptr<ShellBrowser> _shellBrowser;
+ std::auto_ptr<ShellBrowser> _shellBrowser;
LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam)
{
Index: subsys/system/explorer/shell/webchild.cpp
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/shell/webchild.cpp,v
retrieving revision 1.16
diff -u -r1.16 webchild.cpp
--- subsys/system/explorer/shell/webchild.cpp 17 May 2004 13:11:05 -0000 1.16
+++ subsys/system/explorer/shell/webchild.cpp 18 Jul 2004 21:02:52 -0000
@@ -220,7 +220,7 @@
if (SUCCEEDED(hr)) {
_navigator.attach(_control);
- _connector = auto_ptr<EventConnector>(new EventConnector(_control, DIID_DWebBrowserEvents2, this));
+ _connector = std::auto_ptr<EventConnector>(new EventConnector(_control, DIID_DWebBrowserEvents2, this));
_control->Navigate(BStr(info._path), &vtMissing, &vtMissing, &vtMissing, &vtMissing);
//browser->Navigate2(&Variant(info._path), &vtMissing, &vtMissing, &vtMissing, &vtMissing);
Index: subsys/system/explorer/shell/webchild.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/shell/webchild.h,v
retrieving revision 1.13
diff -u -r1.13 webchild.h
--- subsys/system/explorer/shell/webchild.h 10 May 2004 18:02:19 -0000 1.13
+++ subsys/system/explorer/shell/webchild.h 18 Jul 2004 21:02:54 -0000
@@ -1071,7 +1071,7 @@
protected:
BrowserNavigator _navigator;
- auto_ptr<EventConnector> _connector;
+ std::auto_ptr<EventConnector> _connector;
LRESULT WndProc(UINT nmsg, WPARAM wparam, LPARAM lparam);
Index: subsys/system/explorer/taskbar/favorites.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/taskbar/favorites.h,v
retrieving revision 1.7
diff -u -r1.7 favorites.h
--- subsys/system/explorer/taskbar/favorites.h 10 Apr 2004 20:31:18 -0000 1.7
+++ subsys/system/explorer/taskbar/favorites.h 18 Jul 2004 21:02:54 -0000
@@ -73,7 +73,7 @@
};
};
-struct BookmarkList : public list<BookmarkNode>
+struct BookmarkList : public std::list<BookmarkNode>
{
void import_IE_favorites(struct ShellDirectory& dir, HWND hwnd);
Index: subsys/system/explorer/taskbar/quicklaunch.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/taskbar/quicklaunch.h,v
retrieving revision 1.13
diff -u -r1.13 quicklaunch.h
--- subsys/system/explorer/taskbar/quicklaunch.h 28 Mar 2004 14:55:18 -0000 1.13
+++ subsys/system/explorer/taskbar/quicklaunch.h 18 Jul 2004 21:02:54 -0000
@@ -50,7 +50,7 @@
};
/// map for managing the task bar buttons
-struct QuickLaunchMap : public map<int, QuickLaunchEntry>
+struct QuickLaunchMap : public std::map<int, QuickLaunchEntry>
{
~QuickLaunchMap();
};
Index: subsys/system/explorer/taskbar/startmenu.cpp
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/taskbar/startmenu.cpp,v
retrieving revision 1.92
diff -u -r1.92 startmenu.cpp
--- subsys/system/explorer/taskbar/startmenu.cpp 15 Jul 2004 21:04:02 -0000 1.92
+++ subsys/system/explorer/taskbar/startmenu.cpp 18 Jul 2004 21:02:58 -0000
@@ -1011,7 +1011,7 @@
sme._title = title;
sme._icon_id = icon_id;
- ShellEntryMap::iterator it = _entries.insert(make_pair(id, sme)).first;
+ ShellEntryMap::iterator it = _entries.insert(std::make_pair(id, sme)).first;
return it;
}
@@ -1695,7 +1695,7 @@
BitmapSelection sel(mem_dc, bmp);
ClientRect clnt(_hwnd);
- int h = min(_logo_size.cy, clnt.bottom);
+ int h = std::min(_logo_size.cy, clnt.bottom);
RECT rect = {0, 0, _logo_size.cx, clnt.bottom-h};
HBRUSH hbr = CreateSolidBrush(GetPixel(mem_dc, 0, 0));
Index: subsys/system/explorer/taskbar/startmenu.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/taskbar/startmenu.h,v
retrieving revision 1.47
diff -u -r1.47 startmenu.h
--- subsys/system/explorer/taskbar/startmenu.h 20 Jun 2004 21:42:59 -0000 1.47
+++ subsys/system/explorer/taskbar/startmenu.h 18 Jul 2004 21:02:59 -0000
@@ -70,8 +70,8 @@
bool _subfolders;
};
-typedef list<StartMenuDirectory> StartMenuShellDirs;
-typedef set<Entry*> ShellEntrySet;
+typedef std::list<StartMenuDirectory> StartMenuShellDirs;
+typedef std::set<Entry*> ShellEntrySet;
/// structure holding information about one start menu entry
struct StartMenuEntry
@@ -136,7 +136,7 @@
#endif
-typedef list<ShellPath> StartMenuFolders;
+typedef std::list<ShellPath> StartMenuFolders;
/// structor containing information for creating of start menus
struct StartMenuCreateInfo
@@ -152,7 +152,7 @@
#define STARTMENU_CREATOR(WND_CLASS) WINDOW_CREATOR_INFO(WND_CLASS, StartMenuCreateInfo)
-typedef map<int, StartMenuEntry> ShellEntryMap;
+typedef std::map<int, StartMenuEntry> ShellEntryMap;
#ifdef _LIGHT_STARTMENU
@@ -184,7 +184,7 @@
bool _enabled;
};
-typedef vector<SMBtnInfo> SMBtnVector;
+typedef std::vector<SMBtnInfo> SMBtnVector;
extern void DrawStartMenuButton(HDC hdc, const RECT& rect, LPCTSTR title, const SMBtnInfo& btn, bool has_focus, bool pushed);
@@ -441,7 +441,7 @@
#ifndef _SHELL32_FAVORITES
-typedef map<int, BookmarkNode> BookmarkMap;
+typedef std::map<int, BookmarkNode> BookmarkMap;
/// Bookmarks sub-startmenu
struct FavoritesMenu : public StartMenu
Index: subsys/system/explorer/taskbar/taskbar.cpp
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/taskbar/taskbar.cpp,v
retrieving revision 1.47
diff -u -r1.47 taskbar.cpp
--- subsys/system/explorer/taskbar/taskbar.cpp 22 May 2004 08:35:38 -0000 1.47
+++ subsys/system/explorer/taskbar/taskbar.cpp 18 Jul 2004 21:03:00 -0000
@@ -415,8 +415,8 @@
EnumWindows(EnumWndProc, (LPARAM)this);
//EnumDesktopWindows(GetThreadDesktop(GetCurrentThreadId()), EnumWndProc, (LPARAM)_htoolbar);
- set<int> btn_idx_to_delete;
- set<HBITMAP> hbmp_to_delete;
+ std::set<int> btn_idx_to_delete;
+ std::set<HBITMAP> hbmp_to_delete;
for(TaskBarMap::iterator it=_map.begin(); it!=_map.end(); ++it) {
TaskBarEntry& entry = it->second;
@@ -431,7 +431,7 @@
if (!btn_idx_to_delete.empty()) {
// remove buttons from right to left
- for(set<int>::reverse_iterator it=btn_idx_to_delete.rbegin(); it!=btn_idx_to_delete.rend(); ++it) {
+ for(std::set<int>::reverse_iterator it=btn_idx_to_delete.rbegin(); it!=btn_idx_to_delete.rend(); ++it) {
int idx = *it;
SendMessage(_htoolbar, TB_DELETEBUTTON, idx, 0);
@@ -455,7 +455,7 @@
}
}
- for(set<HBITMAP>::iterator it=hbmp_to_delete.begin(); it!=hbmp_to_delete.end(); ++it) {
+ for(std::set<HBITMAP>::iterator it=hbmp_to_delete.begin(); it!=hbmp_to_delete.end(); ++it) {
HBITMAP hbmp = *it;
TBREPLACEBITMAP tbrepl = {0, (UINT_PTR)hbmp, 0, 0};
Index: subsys/system/explorer/taskbar/taskbar.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/taskbar/taskbar.h,v
retrieving revision 1.27
diff -u -r1.27 taskbar.h
--- subsys/system/explorer/taskbar/taskbar.h 20 Mar 2004 13:49:12 -0000 1.27
+++ subsys/system/explorer/taskbar/taskbar.h 18 Jul 2004 21:03:00 -0000
@@ -61,7 +61,7 @@
};
/// map for managing the task bar buttons, mapped by application window handle
-struct TaskBarMap : public map<HWND, TaskBarEntry>
+struct TaskBarMap : public std::map<HWND, TaskBarEntry>
{
~TaskBarMap();
Index: subsys/system/explorer/taskbar/traynotify.cpp
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/taskbar/traynotify.cpp,v
retrieving revision 1.61
diff -u -r1.61 traynotify.cpp
--- subsys/system/explorer/taskbar/traynotify.cpp 17 May 2004 13:11:05 -0000 1.61
+++ subsys/system/explorer/taskbar/traynotify.cpp 18 Jul 2004 21:03:03 -0000
@@ -236,7 +236,7 @@
cfg._tipText = node.get("text");
cfg._windowTitle = node.get("window");
cfg._modulePath = node.get("module");
- const string& mode = node.get("show");
+ const std::string& mode = node.get("show");
if (mode == "show")
cfg._mode = NIM_SHOW;
Index: subsys/system/explorer/taskbar/traynotify.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/taskbar/traynotify.h,v
retrieving revision 1.24
diff -u -r1.24 traynotify.h
--- subsys/system/explorer/taskbar/traynotify.h 28 Mar 2004 14:55:18 -0000 1.24
+++ subsys/system/explorer/taskbar/traynotify.h 18 Jul 2004 21:03:03 -0000
@@ -83,7 +83,7 @@
};
/// list of NotifyIconConfig structures
-typedef list<NotifyIconConfig> NotifyIconCfgList;
+typedef std::list<NotifyIconConfig> NotifyIconCfgList;
/// structure for maintaining informations about one notification icon
@@ -106,8 +106,8 @@
DWORD _lastChange; // timer tick value of the last change
};
-typedef map<NotifyIconIndex, NotifyInfo> NotifyIconMap;
-typedef set<NotifyInfo> NotifyIconSet;
+typedef std::map<NotifyIconIndex, NotifyInfo> NotifyIconMap;
+typedef std::set<NotifyInfo> NotifyIconSet;
struct NotifyHook
@@ -165,7 +165,7 @@
NotifyIconCfgList _cfg;
- map<HWND, String> _window_modules;
+ std::map<HWND, String> _window_modules;
NotifyIconMap _icon_map;
NotifyIconSet _sorted_icons;
@@ -190,8 +190,8 @@
HIMAGELIST _himl;
NotifyArea* _pNotifyArea;
- typedef pair<NOTIFYICONMODE, DWORD> IconStatePair;
- typedef map<NotifyIconIndex, IconStatePair> IconStateMap;
+ typedef std::pair<NOTIFYICONMODE, DWORD> IconStatePair;
+ typedef std::map<NotifyIconIndex, IconStatePair> IconStateMap;
NotifyIconCfgList _cfg_org;
IconStateMap _icon_states_org;
Index: subsys/system/explorer/utility/utility.cpp
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/utility/utility.cpp,v
retrieving revision 1.21
diff -u -r1.21 utility.cpp
--- subsys/system/explorer/utility/utility.cpp 17 May 2004 13:11:06 -0000 1.21
+++ subsys/system/explorer/utility/utility.cpp 18 Jul 2004 21:03:04 -0000
@@ -139,7 +139,7 @@
String Context::getStackTrace() const
{
- ostringstream str;
+ std::ostringstream str;
str << "Context Trace:\n";
Index: subsys/system/explorer/utility/utility.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/utility/utility.h,v
retrieving revision 1.66
diff -u -r1.66 utility.h
--- subsys/system/explorer/utility/utility.h 12 Apr 2004 07:38:17 -0000 1.66
+++ subsys/system/explorer/utility/utility.h 18 Jul 2004 21:03:08 -0000
@@ -170,7 +170,6 @@
// STL headers for strings and streams
#include <string>
#include <iostream>
-using namespace std;
// containers
#include <map>
@@ -731,15 +730,15 @@
/// string class for TCHAR strings
struct String
#ifdef UNICODE
- : public wstring
+ : public std::wstring
#else
- : public string
+ : public std::string
#endif
{
#ifdef UNICODE
- typedef wstring super;
+ typedef std::wstring super;
#else
- typedef string super;
+ typedef std::string super;
#endif
String() {}
@@ -751,7 +750,7 @@
#ifdef UNICODE
String(LPCSTR s) {assign(s);}
String(LPCSTR s, int l) {assign(s, l);}
- String(const string& other) {assign(other.c_str());}
+ String(const std::string& other) {assign(other.c_str());}
String& operator=(LPCSTR s) {assign(s); return *this;}
void assign(LPCSTR s) {if (s) {TCHAR b[BUFFER_LEN]; super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, -1, b, BUFFER_LEN)-1);} else erase();}
void assign(LPCSTR s, int l) {if (s) {TCHAR b[BUFFER_LEN]; super::assign(b, MultiByteToWideChar(CP_ACP, 0, s, l, b, BUFFER_LEN));} else erase();}
@@ -759,7 +758,7 @@
#else
String(LPCWSTR s) {assign(s);}
String(LPCWSTR s, int l) {assign(s, l);}
- String(const wstring& other) {assign(other.c_str());}
+ String(const std::wstring& other) {assign(other.c_str());}
String& operator=(LPCWSTR s) {assign(s); return *this;}
void assign(LPCWSTR s) {if (s) {char b[BUFFER_LEN]; super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, -1, b, BUFFER_LEN, 0, 0)-1);} else erase();}
void assign(LPCWSTR s, int l) {if (s) {char b[BUFFER_LEN]; super::assign(b, WideCharToMultiByte(CP_ACP, 0, s, l, b, BUFFER_LEN, 0, 0));} else erase();}
@@ -776,9 +775,9 @@
operator LPCTSTR() const {return c_str();}
#ifdef UNICODE
- operator string() const {char b[BUFFER_LEN]; return string(b, WideCharToMultiByte(CP_ACP, 0, c_str(), -1, b, BUFFER_LEN, 0, 0)-1);}
+ operator std::string() const {char b[BUFFER_LEN]; return std::string(b, WideCharToMultiByte(CP_ACP, 0, c_str(), -1, b, BUFFER_LEN, 0, 0)-1);}
#else
- operator wstring() const {WCHAR b[BUFFER_LEN]; return wstring(b, MultiByteToWideChar(CP_ACP, 0, c_str(), -1, b, BUFFER_LEN)-1);}
+ operator std::wstring() const {WCHAR b[BUFFER_LEN]; return std::wstring(b, MultiByteToWideChar(CP_ACP, 0, c_str(), -1, b, BUFFER_LEN)-1);}
#endif
String& printf(LPCTSTR fmt, ...)
Index: subsys/system/explorer/utility/window.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/utility/window.h,v
retrieving revision 1.57
diff -u -r1.57 window.h
--- subsys/system/explorer/utility/window.h 10 May 2004 18:02:19 -0000 1.57
+++ subsys/system/explorer/utility/window.h 18 Jul 2004 21:03:10 -0000
@@ -26,7 +26,7 @@
//
-typedef set<HWND> WindowSet;
+typedef std::set<HWND> WindowSet;
/*
@@ -61,7 +61,7 @@
virtual ~Window();
- typedef map<HWND,Window*> WindowMap;
+ typedef std::map<HWND,Window*> WindowMap;
typedef Window* (*CREATORFUNC)(HWND);
typedef Window* (*CREATORFUNC_INFO)(HWND, const void*);
@@ -317,7 +317,7 @@
String _statusText;
String _url;
- stack<String> _url_history;
+ std::stack<String> _url_history;
void set_url(LPCTSTR url);
};
@@ -414,7 +414,7 @@
HWND GetCurrentPage();
protected:
- typedef vector<PROPSHEETPAGE> Vector;
+ typedef std::vector<PROPSHEETPAGE> Vector;
Vector _pages;
HWND _hwnd;
};
Index: subsys/system/explorer/utility/xmlstorage.h
===================================================================
RCS file: /CVS/ReactOS/reactos/subsys/system/explorer/utility/xmlstorage.h,v
retrieving revision 1.24
diff -u -r1.24 xmlstorage.h
--- subsys/system/explorer/utility/xmlstorage.h 18 Jul 2004 09:20:38 -0000 1.24
+++ subsys/system/explorer/utility/xmlstorage.h 18 Jul 2004 21:03:10 -0000
@@ -225,7 +225,7 @@
: super(&_buf),
_pfile(_tfopen(path, TEXT("r"))),
#ifdef __GNUC__
- _buf(_pfile, ios::in)
+ _buf(_pfile, std::ios::in)
#else
_buf(_pfile)
#endif
@@ -252,7 +252,7 @@
: super(&_buf),
_pfile(_tfopen(path, TEXT("w"))),
#ifdef __GNUC__
- _buf(_pfile, ios::out)
+ _buf(_pfile, std::ios::out)
#else
_buf(_pfile)
#endif
More information about the Ros-kernel
mailing list