From e5a432cb6bac029a84d3c490e4a7db45168b2de8 Mon Sep 17 00:00:00 2001 From: Maarten ter Huurne Date: Sat, 16 Aug 2014 05:25:23 +0200 Subject: [PATCH] In C++11, it is no longer necessary to avoid ">>" in nested templates --- src/buttonbox.h | 2 +- src/inputdialog.h | 2 +- src/menu.h | 2 +- src/utilities.h | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/buttonbox.h b/src/buttonbox.h index 9ffa10f..7b68f9d 100644 --- a/src/buttonbox.h +++ b/src/buttonbox.h @@ -21,7 +21,7 @@ public: void handleTS(); private: - std::vector > buttons; + std::vector> buttons; GMenu2X *gmenu2x; }; diff --git a/src/inputdialog.h b/src/inputdialog.h index a8f7feb..77cec8d 100644 --- a/src/inputdialog.h +++ b/src/inputdialog.h @@ -55,7 +55,7 @@ private: bool close, ok; std::string title, text, icon; short curKeyboard; - std::vector< std::vector > keyboard; + std::vector> keyboard; std::vector *kb; int kbLength, kbWidth, kbHeight, kbLeft; SDL_Rect kbRect; diff --git a/src/menu.h b/src/menu.h index 934e427..d0deef6 100644 --- a/src/menu.h +++ b/src/menu.h @@ -59,7 +59,7 @@ private: int iSection, iLink; uint iFirstDispRow; std::vector sections; - std::vector< std::vector > links; + std::vector> links; uint linkColumns, linkRows; diff --git a/src/utilities.h b/src/utilities.h index 5eb3bae..acbef73 100644 --- a/src/utilities.h +++ b/src/utilities.h @@ -27,8 +27,8 @@ #include "inputmanager.h" -typedef std::unordered_map > ConfStrHash; -typedef std::unordered_map > ConfIntHash; +typedef std::unordered_map> ConfStrHash; +typedef std::unordered_map> ConfIntHash; class case_less { public: