[colobot] 17/100: Remove CBotLinkedList from CBotFunction

[Didier Raboud]

This is an automated email from the git hooks/post-receive script.

odyx pushed a commit to branch debian/master
in repository colobot.

commit 6b7233c6aee5f7dc126cfbe444dc829032bc5519
Author: krzys-h <krzys_h at interia.pl>
Date:   Fri Nov 11 19:47:59 2016 +0100

    Remove CBotLinkedList from CBotFunction
    
    Fixup for 191151eb7b4674d69a1d52d88c1261fd13d5a893
    No idea how I managed to forget that
---
 src/CBot/CBotDebug.cpp            | 1 -
 src/CBot/CBotInstr/CBotFunction.h | 5 +----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/CBot/CBotDebug.cpp b/src/CBot/CBotDebug.cpp
index db0c559..c50bb30 100644
--- a/src/CBot/CBotDebug.cpp
+++ b/src/CBot/CBotDebug.cpp
@@ -40,7 +40,6 @@ void CBotDebug::DumpCompiledProgram(CBotProgram* program)
     for (CBotFunction* func : program->GetFunctions())
     {
         funcIdMap[func->m_nFuncIdent] = func;
-        func = func->GetNext();
     }
 
     std::set<CBotInstr*> finished;
diff --git a/src/CBot/CBotInstr/CBotFunction.h b/src/CBot/CBotInstr/CBotFunction.h
index 3221496..66637b5 100644
--- a/src/CBot/CBotInstr/CBotFunction.h
+++ b/src/CBot/CBotInstr/CBotFunction.h
@@ -39,7 +39,7 @@ namespace CBot
  * void classname::test() { ... }
  * \endcode
  */
-class CBotFunction : public CBotInstr, public CBotLinkedList<CBotFunction>
+class CBotFunction : public CBotInstr
 {
 public:
     CBotFunction();
@@ -91,9 +91,6 @@ public:
                       CBotStack* &pj,
                       CBotVar* pInstance = nullptr);
 
-    using CBotLinkedList<CBotFunction>::GetNext;
-    using CBotLinkedList<CBotFunction>::AddNext;
-
     /*!
      * \brief Compile a function call
      *

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git