diff options
| author | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2017-07-14 01:31:22 +0300 |
| commit | 311c175f3184103950c72bc5c775174597430b83 (patch) | |
| tree | ad022dc44a1c4177b3d53bf0d7eaa5a1736c8cf1 /src/gui/windows/npcdialog.h | |
| parent | 16bcb81b0509725e4546bcb3c390ca3c1bb7e7b1 (diff) | |
| download | mv-311c175f3184103950c72bc5c775174597430b83.tar.gz mv-311c175f3184103950c72bc5c775174597430b83.tar.bz2 mv-311c175f3184103950c72bc5c775174597430b83.tar.xz mv-311c175f3184103950c72bc5c775174597430b83.zip | |
Replace std::vector into macro STD_VECTOR.
In most case it equal to std::vector except debug modes.
Now it can be also mse::mstd::vector, but sadly this class not support
all required features.
Diffstat (limited to 'src/gui/windows/npcdialog.h')
| -rw-r--r-- | src/gui/windows/npcdialog.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/windows/npcdialog.h b/src/gui/windows/npcdialog.h index 8e041b087..4680d774d 100644 --- a/src/gui/windows/npcdialog.h +++ b/src/gui/windows/npcdialog.h @@ -279,7 +279,7 @@ class NpcDialog final : public Window, // Used for choice input StringVect mItems; - std::vector<Image *> mImages; + STD_VECTOR<Image *> mImages; ExtendedListBox *mItemList A_NONNULLPOINTER; ScrollArea *mListScrollArea A_NONNULLPOINTER; Container *mSkinContainer A_NONNULLPOINTER; @@ -308,7 +308,7 @@ class NpcDialog final : public Window, NpcInputStateT mInputState; NpcActionStateT mActionState; - std::vector<Widget*> mSkinControls; + STD_VECTOR<Widget*> mSkinControls; std::string mSkinName; PlayerBox *mPlayerBox A_NONNULLPOINTER; Being *mAvatarBeing; |