Remove spaces in > > in nested templates

This commit is contained in:
Thomas Goyne 2012-12-11 10:58:28 -08:00
parent 6e153ed7d9
commit 090905056b
11 changed files with 12 additions and 12 deletions

View file

@ -40,7 +40,7 @@
/// @class AssAttachment
class AssAttachment : public AssEntry {
/// Decoded file data
std::shared_ptr<std::vector<char> > data;
std::shared_ptr<std::vector<char>> data;
/// Encoded data which has been read from the script but not yet decoded
wxString buffer;

View file

@ -47,7 +47,7 @@ enum AssEntryGroup {
ENTRY_GROUP_MAX
};
class AssEntry : public boost::intrusive::make_list_base_hook<boost::intrusive::link_mode<boost::intrusive::auto_unlink> >::type {
class AssEntry : public boost::intrusive::make_list_base_hook<boost::intrusive::link_mode<boost::intrusive::auto_unlink>>::type {
public:
virtual ~AssEntry() { }

View file

@ -49,7 +49,7 @@ class AssDialogue;
class AssStyle;
class AssAttachment;
typedef boost::intrusive::make_list<AssEntry, boost::intrusive::constant_time_size<false> >::type EntryList;
typedef boost::intrusive::make_list<AssEntry, boost::intrusive::constant_time_size<false>>::type EntryList;
typedef EntryList::iterator entryIter;
typedef EntryList::const_iterator constEntryIter;

View file

@ -380,7 +380,7 @@ void DialogFontsCollector::OnRadio(wxCommandEvent &) {
}
void DialogFontsCollector::OnAddText(wxThreadEvent &event) {
std::pair<int, wxString> str = event.GetPayload<std::pair<int, wxString> >();
std::pair<int, wxString> str = event.GetPayload<std::pair<int, wxString>>();
collection_log->SetReadOnly(false);
int pos = collection_log->GetReverseUnicodePosition(collection_log->GetLength());
collection_log->AppendText(str.second);

View file

@ -53,7 +53,7 @@ class DialogKanjiTimer : public wxDialog {
wxComboBox *SourceStyle, *DestStyle;
wxCheckBox *Interpolate;
std::vector<std::pair<AssDialogue*, wxString> > LinesToChange;
std::vector<std::pair<AssDialogue*, wxString>> LinesToChange;
AssEntry *currentSourceLine;
AssEntry *currentDestinationLine;

View file

@ -45,7 +45,7 @@ class DialogProperties : public wxDialog {
agi::Context *c; ///< Project this dialog is adjusting the properties of
/// Pairs of a script property and a text control for that property
std::vector<std::pair<wxString, wxTextCtrl*> > properties;
std::vector<std::pair<wxString, wxTextCtrl*>> properties;
// Things that effect rendering
wxComboBox *WrapStyle; ///< Wrapping style for long lines

View file

@ -31,7 +31,7 @@
template <class func>
class FactoryBase {
protected:
typedef std::map<std::string, std::pair<bool, func> > map;
typedef std::map<std::string, std::pair<bool, func>> map;
typedef typename map::iterator iterator;
static map *classes;

View file

@ -122,9 +122,9 @@ struct menu_item_cmp {
/// handlers makes everything involves events unusably slow.
class CommandManager {
/// Menu items which need to do something on menu open
std::deque<std::pair<std::string, wxMenuItem*> > dynamic_items;
std::deque<std::pair<std::string, wxMenuItem*>> dynamic_items;
/// Menu items which need to be updated only when hotkeys change
std::deque<std::pair<std::string, wxMenuItem*> > static_items;
std::deque<std::pair<std::string, wxMenuItem*>> static_items;
/// window id -> command map
std::vector<std::string> items;
/// MRU menus which need to be updated on menu open

View file

@ -133,7 +133,7 @@ class SubsEditBox : public wxPanel {
/// The start and end times of the selected lines without changes made to
/// avoid negative durations, so that they can be restored if future changes
/// eliminate the negative durations
boost::container::map<AssDialogue *, std::pair<AssTime, AssTime> > initialTimes;
boost::container::map<AssDialogue *, std::pair<AssTime, AssTime>> initialTimes;
// Constructor helpers
wxTextCtrl *MakeMarginCtrl(wxString const& tooltip, int margin, wxString const& commit_msg);

View file

@ -46,7 +46,7 @@ class Thesaurus {
void OnPathChanged();
public:
/// A pair of a word and synonyms for that word
typedef std::pair<std::string, std::vector<std::string> > Entry;
typedef std::pair<std::string, std::vector<std::string>> Entry;
Thesaurus();
~Thesaurus();

View file

@ -143,7 +143,7 @@ void VideoOutGL::InitTextures(int width, int height, GLenum format, int bpp, boo
textureIdList.resize(textureCount);
textureList.resize(textureCount);
CHECK_INIT_ERROR(glGenTextures(textureIdList.size(), &textureIdList[0]));
vector<pair<int, int> > textureSizes;
vector<pair<int, int>> textureSizes;
textureSizes.reserve(textureCount);
/* Unfortunately, we can't simply use one of the two standard ways to do