[Scummvm-cvs-logs] SF.net SVN: scummvm:[51967] scummvm/branches/gsoc2010-plugins
toneman1138 at users.sourceforge.net
toneman1138 at users.sourceforge.net
Wed Aug 11 05:02:34 CEST 2010
Revision: 51967
http://scummvm.svn.sourceforge.net/scummvm/?rev=51967&view=rev
Author: toneman1138
Date: 2010-08-11 03:02:33 +0000 (Wed, 11 Aug 2010)
Log Message:
-----------
finished manual merging of trunk into branch
Modified Paths:
--------------
scummvm/branches/gsoc2010-plugins/test/common/str.h
scummvm/branches/gsoc2010-plugins/tools/create_msvc/create_msvc.cpp
scummvm/branches/gsoc2010-plugins/tools/md5table.c
scummvm/branches/gsoc2010-plugins/tools/module.mk
scummvm/branches/gsoc2010-plugins/tools/scumm-md5.txt
Modified: scummvm/branches/gsoc2010-plugins/test/common/str.h
===================================================================
--- scummvm/branches/gsoc2010-plugins/test/common/str.h 2010-08-11 02:44:11 UTC (rev 51966)
+++ scummvm/branches/gsoc2010-plugins/test/common/str.h 2010-08-11 03:02:33 UTC (rev 51967)
@@ -118,6 +118,30 @@
TS_ASSERT_EQUALS(foo3, "fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd""fooasdkadklasdjklasdjlkasjdlkasjdklasjdlkjasdasd");
}
+ void test_refCount5() {
+ // using external storage
+ Common::String foo1("HelloHelloHelloHelloAndHi");
+ Common::String foo2(foo1);
+
+ for (Common::String::iterator i = foo2.begin(); i != foo2.end(); ++i)
+ *i = 'h';
+
+ TS_ASSERT_EQUALS(foo1, "HelloHelloHelloHelloAndHi");
+ TS_ASSERT_EQUALS(foo2, "hhhhhhhhhhhhhhhhhhhhhhhhh");
+ }
+
+ void test_refCount6() {
+ // using internal storage
+ Common::String foo1("Hello");
+ Common::String foo2(foo1);
+
+ for (Common::String::iterator i = foo2.begin(); i != foo2.end(); ++i)
+ *i = 'h';
+
+ TS_ASSERT_EQUALS(foo1, "Hello");
+ TS_ASSERT_EQUALS(foo2, "hhhhh");
+ }
+
void test_self_asignment() {
Common::String foo1("12345678901234567890123456789012");
foo1 = foo1.c_str() + 2;
Modified: scummvm/branches/gsoc2010-plugins/tools/create_msvc/create_msvc.cpp
===================================================================
--- scummvm/branches/gsoc2010-plugins/tools/create_msvc/create_msvc.cpp 2010-08-11 02:44:11 UTC (rev 51966)
+++ scummvm/branches/gsoc2010-plugins/tools/create_msvc/create_msvc.cpp 2010-08-11 03:02:33 UTC (rev 51967)
@@ -512,8 +512,6 @@
// 4103 (alignment changed after including header, may be due to missing #pragma pack(pop))
// used by pack-start / pack-end
//
- // 4121 (alignment of a member was sensitive to packing)
- //
// 4127 (conditional expression is constant)
// used in a lot of engines
//
@@ -567,7 +565,6 @@
projectWarnings["lure"] = "4189;4355";
projectWarnings["kyra"] = "4355";
projectWarnings["m4"] = "4355";
- projectWarnings["mohawk"] = "4121";
ProjectProvider *provider = NULL;
Modified: scummvm/branches/gsoc2010-plugins/tools/md5table.c
===================================================================
--- scummvm/branches/gsoc2010-plugins/tools/md5table.c 2010-08-11 02:44:11 UTC (rev 51966)
+++ scummvm/branches/gsoc2010-plugins/tools/md5table.c 2010-08-11 03:02:33 UTC (rev 51967)
@@ -222,7 +222,7 @@
const int entrySize = 256;
int numEntries = 0, maxEntries = 1;
- char *entriesBuffer = malloc(maxEntries * entrySize);
+ char *entriesBuffer = (char *)malloc(maxEntries * entrySize);
typedef enum {
kCPPOutput,
@@ -295,7 +295,7 @@
} else if (entry.md5) {
if (numEntries >= maxEntries) {
maxEntries *= 2;
- entriesBuffer = realloc(entriesBuffer, maxEntries * entrySize);
+ entriesBuffer = (char *)realloc(entriesBuffer, maxEntries * entrySize);
}
if (0 == strcmp(entry.variant, "-"))
entry.variant = "";
Modified: scummvm/branches/gsoc2010-plugins/tools/module.mk
===================================================================
--- scummvm/branches/gsoc2010-plugins/tools/module.mk 2010-08-11 02:44:11 UTC (rev 51966)
+++ scummvm/branches/gsoc2010-plugins/tools/module.mk 2010-08-11 03:02:33 UTC (rev 51967)
@@ -36,15 +36,15 @@
tools/convbdf$(EXEEXT): $(srcdir)/tools/convbdf.c
$(QUIET)$(MKDIR) tools/$(DEPDIR)
- $(QUIET_LINK)$(CC) $(CFLAGS) -Wall -o $@ $<
+ $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
tools/md5table$(EXEEXT): $(srcdir)/tools/md5table.c
$(QUIET)$(MKDIR) tools/$(DEPDIR)
- $(QUIET_LINK)$(CC) $(CFLAGS) -Wall -o $@ $<
+ $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
tools/make-scumm-fontdata$(EXEEXT): $(srcdir)/tools/make-scumm-fontdata.c
$(QUIET)$(MKDIR) tools/$(DEPDIR)
- $(QUIET_LINK)$(CC) $(CFLAGS) -Wall -o $@ $<
+ $(QUIET_LINK)$(LD) $(CFLAGS) -Wall -o $@ $<
#
# Rules to explicitly rebuild the credits / MD5 tables.
Modified: scummvm/branches/gsoc2010-plugins/tools/scumm-md5.txt
===================================================================
--- scummvm/branches/gsoc2010-plugins/tools/scumm-md5.txt 2010-08-11 02:44:11 UTC (rev 51966)
+++ scummvm/branches/gsoc2010-plugins/tools/scumm-md5.txt 2010-08-11 03:02:33 UTC (rev 51967)
@@ -591,6 +591,7 @@
airport Let's Explore the Airport with Buzzy
d6334a5a9b61afe18c368540fdf522ca -1 en Mac - - - Joachim Eberhard
07433205acdca3bc553d0e731588b35f -1 en Windows - - - Kirben
+ 3e861421f494711bc6f619d4aba60285 93231 ru Windows - - - sev
7ea2da67ebabea4ac20cee9f4f9d2934 -1 en Mac - Demo - khalek
8ffd618a776a4c0d8922bb28b09f8ce8 -1 en Windows - Demo - khalek
@@ -602,6 +603,7 @@
a5c5388da9bf0e6662fdca8813a79d13 86962 en Windows - - - George Kormendi
a85856675429fe88051744f755b72f93 -1 en Windows - - - Kirben
a2386da005672cbd5136f4f27a626c5f 87061 nl Windows - - - George Kormendi
+ 5dda73606533d66a4c3f4f9ea6e842af 87061 ru Windows - - - sev
39fd6db10d0222d817025c4d3346e3b4 -1 en Mac - Demo - Joachim Eberhard
bf8b52fdd9a69c67f34e8e9fec72661c -1 en Windows HE 71 Demo - khalek, sev
@@ -713,6 +715,7 @@
697c9b7c55a05d8199c48b48e379d2c8 -1 he DOS - - - sev
9dc02577bf50d4cfaf3de3fbac06fbe2 -1 en Mac - - - khalek
9c92eeaf517a31b7221ec2546ab669fd -1 en Windows HE 70 - - khalek
+ 3c4c471342bd95505a42334367d8f127 12161 ru Windows HE 70 - - sev
aa6a91b7f6f119d1b7b1f2a4c9e24d59 6233 en DOS - Demo -
4af4a6b248103c1fe9edef619677f540 -1 en Mac - Demo - khalek
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list