Fix a bunch of stuff that is broken because it's removed in the C++17 standard (don't really have to because _HAS_AUTO_PTR_ETC but might as well)

Author: MaximDude

Activities/GameActivity.h

@@ -951,8 +951,8 @@ class GameActivity:
 
 
     // Comparison functor for sorting objective points by their y pos using STL's sort
-    struct ObjPointYPosComparison:
-        public std::binary_function<ObjectivePoint &, ObjectivePoint &, bool>
+	// TODO: Test to see if not having the binary_function part affects anything. Nothing immediately obvious is wrong without it.
+    struct ObjPointYPosComparison //: public std::binary_function<ObjectivePoint &, ObjectivePoint &, bool>
     {
         bool operator()(ObjectivePoint &rhs, ObjectivePoint &lhs) { return rhs.m_ScenePos.m_Y < lhs.m_ScenePos.m_Y; }
     };

Managers/MovableMan.cpp

@@ -31,8 +31,8 @@ const string MovableMan::m_ClassName = "MovableMan";
 
 
 // Comparison functor for sorting movable objects by their X position using STL's sort
-struct MOXPosComparison:
-    public std::binary_function<MovableObject *, MovableObject *, bool>
+// TODO: Test to see if not having the binary_function part affects anything. Nothing immediately obvious is wrong without it.
+struct MOXPosComparison //: public std::binary_function<MovableObject *, MovableObject *, bool>
 {
     bool operator()(MovableObject *pRhs, MovableObject *pLhs) { return pRhs->GetPos().m_X < pLhs->GetPos().m_X; }
 };
@@ -1862,7 +1862,7 @@ void MovableMan::Update()
 
         // DEATH //////////////////////////////////////////////////////////
         // Transfer dead actors from Actor list to particle list
-        aIt = partition(m_Actors.begin(), m_Actors.end(), std::not1(std::mem_fun(&Actor::IsDead)));
+        aIt = partition(m_Actors.begin(), m_Actors.end(), std::not_fn(std::mem_fn(&Actor::IsDead)));
         amidIt = aIt;
 
         // Move dead Actor to particles list
@@ -1889,7 +1889,7 @@ void MovableMan::Update()
 
         // ITEM SETTLE //////////////////////////////////////////////////////////
         // Transfer excess items to particle list - use stable partition, item orde is important
-        iIt = stable_partition(m_Items.begin(), m_Items.end(), std::not1(std::mem_fun(&MovableObject::ToSettle)));
+        iIt = stable_partition(m_Items.begin(), m_Items.end(), std::not_fn(std::mem_fn(&MovableObject::ToSettle)));
         imidIt = iIt;
 
         // Move force-settled items to particles list
@@ -1909,7 +1909,7 @@ void MovableMan::Update()
         // DELETE //////////////////////////////////////////////////////////
         // Only delete after all travels & updates are done
         // Actors
-        aIt = partition(m_Actors.begin(), m_Actors.end(), std::not1(std::mem_fun(&MovableObject::ToDelete)));
+        aIt = partition(m_Actors.begin(), m_Actors.end(), std::not_fn(std::mem_fn(&MovableObject::ToDelete)));
         amidIt = aIt;
 
         while (aIt != m_Actors.end())
@@ -1938,15 +1938,15 @@ void MovableMan::Update()
         m_Actors.erase(amidIt, m_Actors.end());
 
         // Items
-        iIt = stable_partition(m_Items.begin(), m_Items.end(), std::not1(std::mem_fun(&MovableObject::ToDelete)));
+        iIt = stable_partition(m_Items.begin(), m_Items.end(), std::not_fn(std::mem_fn(&MovableObject::ToDelete)));
         imidIt = iIt;
 
         while (iIt != m_Items.end())
             delete *(iIt++);
         m_Items.erase(imidIt, m_Items.end());
 
         // Particles
-        parIt = partition(m_Particles.begin(), m_Particles.end(), std::not1(std::mem_fun(&MovableObject::ToDelete)));
+        parIt = partition(m_Particles.begin(), m_Particles.end(), std::not_fn(std::mem_fn(&MovableObject::ToDelete)));
         midIt = parIt;
 
         while (parIt != m_Particles.end())
@@ -1958,7 +1958,7 @@ void MovableMan::Update()
     // Only settle after all updates and deletions are done
     if (m_SettlingEnabled)
     {
-        parIt = partition(m_Particles.begin(), m_Particles.end(), std::not1(std::mem_fun(&MovableObject::ToSettle)));
+        parIt = partition(m_Particles.begin(), m_Particles.end(), std::not_fn(std::mem_fn(&MovableObject::ToSettle)));
         midIt = parIt;
 
         while (parIt != m_Particles.end())

Menus/BuyMenuGUI.cpp

@@ -1876,7 +1876,7 @@ void BuyMenuGUI::CategoryChange(bool focusOnCategoryTabs)
                     pItemBitmap = pModule->GetIcon() ? new AllegroBitmap(pModule->GetIcon()) : 0;
                     // Passing in ownership of the bitmap, making uppercase the name
                     string name = pModule->GetFriendlyName();
-                    transform(name.begin(), name.end(), name.begin(), std::pointer_to_unary_function<int, int>(toupper));
+                    transform(name.begin(), name.end(), name.begin(), ::toupper);
                     m_pShopList->AddItem(name, m_aExpandedModules[moduleID] ? "-" : "+", pItemBitmap, 0, moduleID);
                 }
 

Menus/ObjectPickerGUI.cpp

@@ -1279,7 +1279,7 @@ void ObjectPickerGUI::UpdateObjectsList(bool selectTop)
                     pItemBitmap = pModule->GetIcon() ? new AllegroBitmap(pModule->GetIcon()) : 0;
                     // Passing in ownership of the bitmap, making uppercase the name
                     string name = pModule->GetFriendlyName();
-                    transform(name.begin(), name.end(), name.begin(), std::pointer_to_unary_function<int, int>(toupper));
+                    transform(name.begin(), name.end(), name.begin(), ::toupper);
                     m_pObjectsList->AddItem(name, m_aExpandedModules[moduleID] ? "-" : "+", pItemBitmap, 0, moduleID);
                 }