Remove global "using namespace std;" declarations, use "std::" prefixes on all std elements
Fix whitespace changes
This commit is contained in:
committed by
Martin Natano
parent
f0680a29fc
commit
0cba3579de
@@ -41,7 +41,7 @@ struct ConfOption
|
||||
|
||||
/* Return the list of available selections; Get() and Put() use indexes into
|
||||
* this array. UpdateAvailableOptions() should be called before using this. */
|
||||
void MakeOptionsList( vector<RString> &out ) const;
|
||||
void MakeOptionsList( std::vector<RString> &out ) const;
|
||||
|
||||
inline int Get() const { int sel; MoveData( sel, true, this ); return sel; }
|
||||
inline void Put( int sel ) const { MoveData( sel, false, this ); }
|
||||
@@ -63,7 +63,7 @@ struct ConfOption
|
||||
#undef PUSH
|
||||
|
||||
ConfOption( const char *n, MoveData_t m,
|
||||
void (*lst)( vector<RString> &out ) )
|
||||
void (*lst)( std::vector<RString> &out ) )
|
||||
{
|
||||
name = n;
|
||||
MoveData = m;
|
||||
@@ -74,8 +74,8 @@ struct ConfOption
|
||||
|
||||
|
||||
// private:
|
||||
vector<RString> names;
|
||||
void (*MakeOptionsListCB)( vector<RString> &out );
|
||||
std::vector<RString> names;
|
||||
void (*MakeOptionsListCB)( std::vector<RString> &out );
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user