Ticket #8060: scummvm.diff

File scummvm.diff, 5.1 KB (added by SF/cccp_99, 22 years ago)

changed files: common/str.cpp and scumm/dialogs.cpp

  • scummvm/common/str.cpp 

    RCS file: /cvsroot/scummvm/scummvm/common/str.cpp,v
retrieving revision 1.5
diff -u -r1.5 str.cpp
     
    2020
    2121#include "stdafx.h"
    2222#include "str.h"
    23 #include "util.h"
    24 
    2523
    26 #ifdef _MSC_VER
    2724
    28 #       pragma warning( disable : 4068 ) // unknown pragmas
    2925
    30 #endif
    3126
     27
     28#ifdef _MSC_VER
     29#       pragma warning( disable : 4068 ) // unknown pragmas
     30#endif

  • scummvm/scumm/dialogs.cpp 

    +
 
 namespace ScummVM {
 
@@ -32,7 +32,7 @@
 {
 	_refCount = new int(1);
 	if (str) {		
-		_capacity = _len = resStrLen(str);
+		_capacity = _len = strlen(str);
 		_str = (char *)calloc(1, _capacity+1);
 		memcpy(_str, str, _len+1);
 	} else {
@@ -46,7 +46,7 @@
 	printf("String::String(const ConstString &str)\n");
 	_refCount = new int(1);
 	if (str._str) {		
-		_capacity = _len = resStrLen(str._str);
+		_capacity = _len = strlen(str._str);
 		_str = (char *)calloc(1, _capacity+1);
 		memcpy(_str, str._str, _len+1);
 	} else {
@@ -82,7 +82,7 @@
 
 String& String::operator  =(const char* str)
 {	
-	int len = resStrLen(str);
+	int len = strlen(str);
 	if (len > 0) {
 		ensureCapacity(len, false);
 		
@@ -115,7 +115,7 @@
 
 String& String::operator +=(const char* str)
 {
-	int len = resStrLen(str);
+	int len = strlen(str);
 	if (len > 0) {
 		ensureCapacity(_len + len, true);
 
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.3
diff -u -r1.3 dialogs.cpp
     
    2929#include "gui/ListWidget.h"
    3030#include "common/config-file.h"
    3131
    32 
    3332
    34 #ifdef _MSC_VER
    3533
    36 #       pragma warning( disable : 4068 )
    3734
    38 #endif
    3935
    40 
    4136
     37
     38#ifdef _MSC_VER
     39#       pragma warning( disable : 4068 )
     40#endif
     41