summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2005-08-23 21:16:18 +0000
committerBjörn Steinbrink <B.Steinbrink@gmx.de>2005-08-23 21:16:18 +0000
commit4683edefdede2f482cc43c4fb516dba9ce50318c (patch)
tree39217fecd4335293b3f926a71eb244b519b6e7f8
parentedfe5e4525d16a477a1c88344e3321ccf23b605e (diff)
downloadmana-4683edefdede2f482cc43c4fb516dba9ce50318c.tar.gz
mana-4683edefdede2f482cc43c4fb516dba9ce50318c.tar.bz2
mana-4683edefdede2f482cc43c4fb516dba9ce50318c.tar.xz
mana-4683edefdede2f482cc43c4fb516dba9ce50318c.zip
Fixed errornous forward declaration.
-rw-r--r--ChangeLog2
-rw-r--r--src/gui/shop.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index e2bbb581..ad0428c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-08-23 Björn Steinbrink <B.Steinbrink@gmx.de>
+ * src/gui/shop.h: Fixed using a forward declaration for std::string, where
+ it was a class member.
* src/game.cpp, src/gui/sell.cpp, src/gui/sell.h: Made the sell dialog
accepts Items instead of looking them up in the inventory.
* src/gui/sell.cpp: Some code cleanups, simplifications and removal of
diff --git a/src/gui/shop.h b/src/gui/shop.h
index 4589e01a..e256f869 100644
--- a/src/gui/shop.h
+++ b/src/gui/shop.h
@@ -24,7 +24,7 @@
#ifndef _SHOP_H
#define _SHOP_H
-#include <iosfwd>
+#include <string>
struct ITEM_SHOP {
std::string name;