浏览代码

bbString fixes I thought I'd already commited?

Mark Sibly 8 年之前
父节点
当前提交
15fe212b54
共有 3 个文件被更改,包括 3 次插入7 次删除
  1. 0 5
      modules/monkey/native/bbstring.cpp
  2. 1 1
      modules/monkey/native/bbstring.h
  3. 2 1
      modules/monkey/native/bbstring.mm

+ 0 - 5
modules/monkey/native/bbstring.cpp

@@ -174,11 +174,6 @@ bbString::bbString( const wchar_t *data ):_rep( Rep::create( data ) ){
 bbString::bbString( const wchar_t *data,int length ):_rep( Rep::create( data,length ) ){
 }
 
-#if __OBJC__
-bbString::bbString( NSString *str ):_rep( Rep::create( str.UTF8String ) ){
-}
-#endif
-
 int bbString::utf8Length()const{
 
 	const bbChar *p=data();

+ 1 - 1
modules/monkey/native/bbstring.h

@@ -75,7 +75,7 @@ class bbString{
 	bbString( const wchar_t *data,int length );
 	
 #if __OBJC__
-	bbString( NSString *str );
+	bbString( const NSString *str );
 #endif
 
 	explicit bbString( int n );

+ 2 - 1
modules/monkey/native/bbstring.mm

@@ -1,9 +1,10 @@
 
 #include "bbstring.h"
 
-bbString::bbString( NSString *str ):_rep( Rep::create( str.UTF8String ) ){
+bbString::bbString( const NSString *str ):_rep( Rep::create( str.UTF8String ) ){
 }
 
 NSString *bbString::ToNSString()const{
+
 	return [NSString stringWithUTF8String:c_str()];
 }