Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2026-04-20 15:17:50 +00:00
Code Issues Projects Releases Wiki Activity

Qualified all STL refs with std:: to get rid of the 'using namespace std' mismatch between the main code & debugger code

Browse Source
This commit is contained in:
tomcw
2014-08-14 20:29:01 +01:00
parent c1bfb8075c
commit cbdad2a02f
17 changed files with 39 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/Debugger/Debug.cpp
+11 -14
View File
@@ -56,7 +56,6 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
bool g_bDebuggerEatKey = false;
// Bookmarks __________________________________________________________________
// vector<int> g_aBookmarks;
int g_nBookmarks = 0;
Bookmark_t g_aBookmarks[ MAX_BOOKMARKS ];
@@ -126,8 +125,8 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
int g_iCommand; // last command (enum) // used for consecutive commands
vector<int> g_vPotentialCommands; // global, since TAB-completion also needs
vector<Command_t> g_vSortedCommands;
std::vector<int> g_vPotentialCommands; // global, since TAB-completion also needs
std::vector<Command_t> g_vSortedCommands;
// static const char g_aFlagNames[_6502_NUM_FLAGS+1] = TEXT("CZIDBRVN");// Reversed since arrays are from left-to-right
@@ -1615,7 +1614,7 @@ void _BWZ_ListAll( const Breakpoint_t * aBreakWatchZero, const int nMax )
Update_t CmdBreakpointList (int nArgs)
{
// ConsoleBufferPush( );
// vector<int> vBreakpoints;
// std::vector<int> vBreakpoints;
// int iBreakpoint = MAX_BREAKPOINTS;
// while (iBreakpoint--)
// {
@@ -1624,7 +1623,7 @@ Update_t CmdBreakpointList (int nArgs)
// vBreakpoints.push_back( g_aBreakpoints[iBreakpoint].address );
// }
// }
// sort( vBreakpoints.begin(), vBreakpoints.end() );
// std::sort( vBreakpoints.begin(), vBreakpoints.end() );
// iBreakpoint = vBreakPoints.size();
if (! g_nBreakpoints)
@@ -3194,7 +3193,7 @@ Update_t CmdCursorLineUp (int nArgs)
const int MAX_LOOK_AHEAD = g_nDisasmWinHeight;
static vector<LookAhead_t> aTopCandidates;
static std::vector<LookAhead_t> aTopCandidates;
LookAhead_t tCandidate;
// if (! aBestTop.capacity() )
@@ -5256,9 +5255,7 @@ Update_t CmdOutputPrintf (int nArgs)
TCHAR sText[ CONSOLE_WIDTH ] = TEXT("");
// vector<PrintFormat_t> aValues;
// PrintFormat_t entry;
vector<Arg_t> aValues;
std::vector<Arg_t> aValues;
Arg_t entry;
int iValue = 0;
int nValue = 0;
@@ -6715,7 +6712,7 @@ int FindCommand( LPTSTR pName, CmdFuncPtr_t & pFunction_, int * iCommand_ )
g_iCommand = g_aCommands[iCommand].iCommand;
// Don't push the same comamnd/alias if already on the list
if (find( g_vPotentialCommands.begin(), g_vPotentialCommands.end(), g_iCommand) == g_vPotentialCommands.end())
if (std::find( g_vPotentialCommands.begin(), g_vPotentialCommands.end(), g_iCommand) == g_vPotentialCommands.end())
{
nFound++;
g_vPotentialCommands.push_back( g_iCommand );
@@ -7195,12 +7192,12 @@ void ProfileFormat( bool bExport, ProfileFormat_e eFormatMode )
bool bOpcodeGood = true;
bool bOpmodeGood = true;
vector< ProfileOpcode_t > vProfileOpcode( &g_aProfileOpcodes[0], &g_aProfileOpcodes[ NUM_OPCODES ] );
vector< ProfileOpmode_t > vProfileOpmode( &g_aProfileOpmodes[0], &g_aProfileOpmodes[ NUM_OPMODES ] );
std::vector< ProfileOpcode_t > vProfileOpcode( &g_aProfileOpcodes[0], &g_aProfileOpcodes[ NUM_OPCODES ] );
std::vector< ProfileOpmode_t > vProfileOpmode( &g_aProfileOpmodes[0], &g_aProfileOpmodes[ NUM_OPMODES ] );
// sort >
sort( vProfileOpcode.begin(), vProfileOpcode.end(), ProfileOpcode_t() );
sort( vProfileOpmode.begin(), vProfileOpmode.end(), ProfileOpmode_t() );
std::sort( vProfileOpcode.begin(), vProfileOpcode.end(), ProfileOpcode_t() );
std::sort( vProfileOpmode.begin(), vProfileOpmode.end(), ProfileOpmode_t() );
Profile_t nOpcodeTotal = 0;
Profile_t nOpmodeTotal = 0;