From 6d7af74bab17c03f1604e8351d397695286414ed Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Tue, 9 Oct 2012 22:53:51 +0300
Subject: Fix some stlport issues.

---
 src/resources/imagewriter.h |  2 ++
 src/resources/iteminfo.cpp  | 31 -------------------------------
 src/resources/iteminfo.h    |  2 +-
 3 files changed, 3 insertions(+), 32 deletions(-)

(limited to 'src/resources')

diff --git a/src/resources/imagewriter.h b/src/resources/imagewriter.h
index 8603fa119..94e5f2d01 100644
--- a/src/resources/imagewriter.h
+++ b/src/resources/imagewriter.h
@@ -22,6 +22,8 @@
 
 #include <iosfwd>
 
+#include <string>
+
 #include "localconsts.h"
 
 struct SDL_Surface;
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index c7d8ecc0e..eb85e5c9e 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -34,37 +34,6 @@
 
 extern int serverVersion;
 
-/*
-ItemInfo::ItemInfo(ItemInfo &info)
-{
-    mMissileParticleFile = info.mMissileParticleFile;
-    mDisplay = info.mDisplay;
-    mName = info.mName;
-    mDescription = info.mDescription;
-    mEffect = info.mEffect;
-    mType = info.mType;
-    mParticle = info.mParticle;
-    mWeight = info.mWeight;
-    mView = info.mView;
-    mId = info.mId;
-    mIsRemoveSprites = info.mIsRemoveSprites;
-    mAttackAction = info.mAttackAction;
-    mAttackRange = info.mAttackRange;
-    mMissileParticle = info.mMissileParticle;
-    mColors = info.mColors;
-    mColorList = info.mColorList;
-    mHitEffectId = info.mHitEffectId;
-    mCriticalHitEffectId = info.mCriticalHitEffectId;
-    for (int f = 0; f < 9; f ++)
-    {
-        mSpriteToItemReplaceMap[f] = 0;
-        mDrawBefore[f] = info.mDrawBefore[f];
-        mDrawAfter[f] = info.mDrawAfter[f];
-        mDrawPriority[f] = info.mDrawPriority[f];
-    }
-}
-*/
-
 ItemInfo::ItemInfo() :
     mMissileParticleFile(""),
     mName(""),
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index ba429341d..704ad79eb 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -105,7 +105,7 @@ class ItemInfo final
          */
         ItemInfo();
 
-//        ItemInfo(ItemInfo &info);
+        A_DELETE_COPY(ItemInfo);
 
         ~ItemInfo();
 
-- 
cgit v1.2.3-60-g2f50