[colobot] 48/145: Fix array in a class not working with sizeof()...
Didier Raboud
odyx at moszumanska.debian.org
Mon Jul 11 12:56:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
odyx pushed a commit to branch debian/master
in repository colobot.
commit 748f0034bd613f587607be9e761cca0347d06059
Author: melex750 <melex750 at users.noreply.github.com>
Date: Tue Apr 5 14:28:36 2016 -0400
Fix array in a class not working with sizeof()...
...when no assignment is made in the definition.
It should pass this unit test now:
TEST_F(CBotUT, DISABLED_ArraysInClasses)
---
src/CBot/CBotClass.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/CBot/CBotClass.cpp b/src/CBot/CBotClass.cpp
index 1995dd9..70c72ef 100644
--- a/src/CBot/CBotClass.cpp
+++ b/src/CBot/CBotClass.cpp
@@ -22,6 +22,7 @@
#include "CBot/CBotInstr/CBotInstrUtils.h"
#include "CBot/CBotInstr/CBotNew.h"
#include "CBot/CBotInstr/CBotLeftExprVar.h"
+#include "CBot/CBotInstr/CBotExprLitNull.h"
#include "CBot/CBotInstr/CBotTwoOpExpr.h"
#include "CBot/CBotInstr/CBotFunction.h"
#include "CBot/CBotInstr/CBotExpression.h"
@@ -722,6 +723,7 @@ bool CBotClass::CompileDefItem(CBotToken* &p, CBotCStack* pStack, bool bSecond)
}
if ( !pStack->IsOk() ) return false;
}
+ else if ( type2.Eq(CBotTypArrayPointer) ) i = new CBotExprLitNull();
if ( !bSecond )
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/colobot.git
More information about the Pkg-games-commits
mailing list