--- a/genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/eabi/libstdcpp_rvct2_2u.def Mon May 03 14:06:43 2010 +0300
@@ -591,8 +591,8 @@
_ZTIN9stlp_priv9_MessagesE @ 590 NONAME
_ZTINSt6locale5facetE @ 591 NONAME
_ZTINSt8ios_base7failureE @ 592 NONAME
- _ZTISd @ 593 NONAME
- _ZTISo @ 594 NONAME
+ _ZTISd @ 593 NONAME ABSENT
+ _ZTISo @ 594 NONAME ABSENT
_ZTISt10istrstream @ 595 NONAME
_ZTISt10moneypunctIcLb0EE @ 596 NONAME
_ZTISt10moneypunctIcLb1EE @ 597 NONAME
@@ -607,20 +607,20 @@
_ZTISt12length_error @ 606 NONAME
_ZTISt12out_of_range @ 607 NONAME
_ZTISt12strstreambuf @ 608 NONAME
- _ZTISt13basic_filebufIcSt11char_traitsIcEE @ 609 NONAME
- _ZTISt13basic_filebufIwSt11char_traitsIwEE @ 610 NONAME
- _ZTISt13basic_ostreamIwSt11char_traitsIwEE @ 611 NONAME
+ _ZTISt13basic_filebufIcSt11char_traitsIcEE @ 609 NONAME ABSENT
+ _ZTISt13basic_filebufIwSt11char_traitsIwEE @ 610 NONAME ABSENT
+ _ZTISt13basic_ostreamIwSt11char_traitsIwEE @ 611 NONAME ABSENT
_ZTISt13runtime_error @ 612 NONAME
- _ZTISt14basic_iostreamIwSt11char_traitsIwEE @ 613 NONAME
+ _ZTISt14basic_iostreamIwSt11char_traitsIwEE @ 613 NONAME ABSENT
_ZTISt14codecvt_bynameIcc11_mb_state_tE @ 614 NONAME
_ZTISt14codecvt_bynameIwc11_mb_state_tE @ 615 NONAME
_ZTISt14collate_bynameIcE @ 616 NONAME
_ZTISt14collate_bynameIwE @ 617 NONAME
_ZTISt14overflow_error @ 618 NONAME
- _ZTISt15basic_streambufIcSt11char_traitsIcEE @ 619 NONAME
- _ZTISt15basic_streambufIwSt11char_traitsIwEE @ 620 NONAME
- _ZTISt15basic_stringbufIcSt11char_traitsIcESaIcEE @ 621 NONAME
- _ZTISt15basic_stringbufIwSt11char_traitsIwESaIwEE @ 622 NONAME
+ _ZTISt15basic_streambufIcSt11char_traitsIcEE @ 619 NONAME ABSENT
+ _ZTISt15basic_streambufIwSt11char_traitsIwEE @ 620 NONAME ABSENT
+ _ZTISt15basic_stringbufIcSt11char_traitsIcESaIcEE @ 621 NONAME ABSENT
+ _ZTISt15basic_stringbufIwSt11char_traitsIwESaIwEE @ 622 NONAME ABSENT
_ZTISt15messages_bynameIcE @ 623 NONAME
_ZTISt15messages_bynameIwE @ 624 NONAME
_ZTISt15numpunct_bynameIcE @ 625 NONAME
@@ -632,12 +632,12 @@
_ZTISt17moneypunct_bynameIcLb1EE @ 631 NONAME
_ZTISt17moneypunct_bynameIwLb0EE @ 632 NONAME
_ZTISt17moneypunct_bynameIwLb1EE @ 633 NONAME
- _ZTISt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 634 NONAME
- _ZTISt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 635 NONAME
- _ZTISt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 636 NONAME
- _ZTISt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 637 NONAME
- _ZTISt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 638 NONAME
- _ZTISt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 639 NONAME
+ _ZTISt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 634 NONAME ABSENT
+ _ZTISt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 635 NONAME ABSENT
+ _ZTISt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 636 NONAME ABSENT
+ _ZTISt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 637 NONAME ABSENT
+ _ZTISt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 638 NONAME ABSENT
+ _ZTISt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 639 NONAME ABSENT
_ZTISt5ctypeIcE @ 640 NONAME
_ZTISt5ctypeIwE @ 641 NONAME
_ZTISt7codecvtIcc11_mb_state_tE @ 642 NONAME
@@ -690,8 +690,8 @@
_ZTVN9stlp_priv9_MessagesE @ 689 NONAME
_ZTVNSt6locale5facetE @ 690 NONAME
_ZTVNSt8ios_base7failureE @ 691 NONAME
- _ZTVSd @ 692 NONAME
- _ZTVSo @ 693 NONAME
+ _ZTVSd @ 692 NONAME ABSENT
+ _ZTVSo @ 693 NONAME ABSENT
_ZTVSt10istrstream @ 694 NONAME
_ZTVSt10moneypunctIcLb0EE @ 695 NONAME
_ZTVSt10moneypunctIcLb1EE @ 696 NONAME
@@ -706,20 +706,20 @@
_ZTVSt12length_error @ 705 NONAME
_ZTVSt12out_of_range @ 706 NONAME
_ZTVSt12strstreambuf @ 707 NONAME
- _ZTVSt13basic_filebufIcSt11char_traitsIcEE @ 708 NONAME
- _ZTVSt13basic_filebufIwSt11char_traitsIwEE @ 709 NONAME
- _ZTVSt13basic_ostreamIwSt11char_traitsIwEE @ 710 NONAME
+ _ZTVSt13basic_filebufIcSt11char_traitsIcEE @ 708 NONAME ABSENT
+ _ZTVSt13basic_filebufIwSt11char_traitsIwEE @ 709 NONAME ABSENT
+ _ZTVSt13basic_ostreamIwSt11char_traitsIwEE @ 710 NONAME ABSENT
_ZTVSt13runtime_error @ 711 NONAME
- _ZTVSt14basic_iostreamIwSt11char_traitsIwEE @ 712 NONAME
+ _ZTVSt14basic_iostreamIwSt11char_traitsIwEE @ 712 NONAME ABSENT
_ZTVSt14codecvt_bynameIcc11_mb_state_tE @ 713 NONAME
_ZTVSt14codecvt_bynameIwc11_mb_state_tE @ 714 NONAME
_ZTVSt14collate_bynameIcE @ 715 NONAME
_ZTVSt14collate_bynameIwE @ 716 NONAME
_ZTVSt14overflow_error @ 717 NONAME
- _ZTVSt15basic_streambufIcSt11char_traitsIcEE @ 718 NONAME
- _ZTVSt15basic_streambufIwSt11char_traitsIwEE @ 719 NONAME
- _ZTVSt15basic_stringbufIcSt11char_traitsIcESaIcEE @ 720 NONAME
- _ZTVSt15basic_stringbufIwSt11char_traitsIwESaIwEE @ 721 NONAME
+ _ZTVSt15basic_streambufIcSt11char_traitsIcEE @ 718 NONAME ABSENT
+ _ZTVSt15basic_streambufIwSt11char_traitsIwEE @ 719 NONAME ABSENT
+ _ZTVSt15basic_stringbufIcSt11char_traitsIcESaIcEE @ 720 NONAME ABSENT
+ _ZTVSt15basic_stringbufIwSt11char_traitsIwESaIwEE @ 721 NONAME ABSENT
_ZTVSt15messages_bynameIcE @ 722 NONAME
_ZTVSt15messages_bynameIwE @ 723 NONAME
_ZTVSt15numpunct_bynameIcE @ 724 NONAME
@@ -731,12 +731,12 @@
_ZTVSt17moneypunct_bynameIcLb1EE @ 730 NONAME
_ZTVSt17moneypunct_bynameIwLb0EE @ 731 NONAME
_ZTVSt17moneypunct_bynameIwLb1EE @ 732 NONAME
- _ZTVSt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 733 NONAME
- _ZTVSt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 734 NONAME
- _ZTVSt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 735 NONAME
- _ZTVSt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 736 NONAME
- _ZTVSt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 737 NONAME
- _ZTVSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 738 NONAME
+ _ZTVSt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 733 NONAME ABSENT
+ _ZTVSt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 734 NONAME ABSENT
+ _ZTVSt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 735 NONAME ABSENT
+ _ZTVSt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 736 NONAME ABSENT
+ _ZTVSt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 737 NONAME ABSENT
+ _ZTVSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 738 NONAME ABSENT
_ZTVSt5ctypeIcE @ 739 NONAME
_ZTVSt5ctypeIwE @ 740 NONAME
_ZTVSt7codecvtIcc11_mb_state_tE @ 741 NONAME
--- a/genericopenlibs/cppstdlib/eabi/libstdcppv5u.def Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/eabi/libstdcppv5u.def Mon May 03 14:06:43 2010 +0300
@@ -591,8 +591,8 @@
_ZTIN9stlp_priv9_MessagesE @ 590 NONAME
_ZTINSt6locale5facetE @ 591 NONAME
_ZTINSt8ios_base7failureE @ 592 NONAME
- _ZTISd @ 593 NONAME
- _ZTISo @ 594 NONAME
+ _ZTISd @ 593 NONAME ABSENT
+ _ZTISo @ 594 NONAME ABSENT
_ZTISt10istrstream @ 595 NONAME
_ZTISt10moneypunctIcLb0EE @ 596 NONAME
_ZTISt10moneypunctIcLb1EE @ 597 NONAME
@@ -607,20 +607,20 @@
_ZTISt12length_error @ 606 NONAME
_ZTISt12out_of_range @ 607 NONAME
_ZTISt12strstreambuf @ 608 NONAME
- _ZTISt13basic_filebufIcSt11char_traitsIcEE @ 609 NONAME
- _ZTISt13basic_filebufIwSt11char_traitsIwEE @ 610 NONAME
- _ZTISt13basic_ostreamIwSt11char_traitsIwEE @ 611 NONAME
+ _ZTISt13basic_filebufIcSt11char_traitsIcEE @ 609 NONAME ABSENT
+ _ZTISt13basic_filebufIwSt11char_traitsIwEE @ 610 NONAME ABSENT
+ _ZTISt13basic_ostreamIwSt11char_traitsIwEE @ 611 NONAME ABSENT
_ZTISt13runtime_error @ 612 NONAME
- _ZTISt14basic_iostreamIwSt11char_traitsIwEE @ 613 NONAME
+ _ZTISt14basic_iostreamIwSt11char_traitsIwEE @ 613 NONAME ABSENT
_ZTISt14codecvt_bynameIcc11_mb_state_tE @ 614 NONAME
_ZTISt14codecvt_bynameIwc11_mb_state_tE @ 615 NONAME
_ZTISt14collate_bynameIcE @ 616 NONAME
_ZTISt14collate_bynameIwE @ 617 NONAME
_ZTISt14overflow_error @ 618 NONAME
- _ZTISt15basic_streambufIcSt11char_traitsIcEE @ 619 NONAME
- _ZTISt15basic_streambufIwSt11char_traitsIwEE @ 620 NONAME
- _ZTISt15basic_stringbufIcSt11char_traitsIcESaIcEE @ 621 NONAME
- _ZTISt15basic_stringbufIwSt11char_traitsIwESaIwEE @ 622 NONAME
+ _ZTISt15basic_streambufIcSt11char_traitsIcEE @ 619 NONAME ABSENT
+ _ZTISt15basic_streambufIwSt11char_traitsIwEE @ 620 NONAME ABSENT
+ _ZTISt15basic_stringbufIcSt11char_traitsIcESaIcEE @ 621 NONAME ABSENT
+ _ZTISt15basic_stringbufIwSt11char_traitsIwESaIwEE @ 622 NONAME ABSENT
_ZTISt15messages_bynameIcE @ 623 NONAME
_ZTISt15messages_bynameIwE @ 624 NONAME
_ZTISt15numpunct_bynameIcE @ 625 NONAME
@@ -632,12 +632,12 @@
_ZTISt17moneypunct_bynameIcLb1EE @ 631 NONAME
_ZTISt17moneypunct_bynameIwLb0EE @ 632 NONAME
_ZTISt17moneypunct_bynameIwLb1EE @ 633 NONAME
- _ZTISt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 634 NONAME
- _ZTISt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 635 NONAME
- _ZTISt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 636 NONAME
- _ZTISt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 637 NONAME
- _ZTISt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 638 NONAME
- _ZTISt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 639 NONAME
+ _ZTISt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 634 NONAME ABSENT
+ _ZTISt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 635 NONAME ABSENT
+ _ZTISt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 636 NONAME ABSENT
+ _ZTISt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 637 NONAME ABSENT
+ _ZTISt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 638 NONAME ABSENT
+ _ZTISt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 639 NONAME ABSENT
_ZTISt5ctypeIcE @ 640 NONAME
_ZTISt5ctypeIwE @ 641 NONAME
_ZTISt7codecvtIcc11_mb_state_tE @ 642 NONAME
@@ -662,26 +662,26 @@
_ZTISt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE @ 661 NONAME
_ZTISt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE @ 662 NONAME
_ZTISt9strstream @ 663 NONAME
- _ZTTSd @ 664 NONAME
- _ZTTSi @ 665 NONAME
- _ZTTSo @ 666 NONAME
+ _ZTTSd @ 664 NONAME ABSENT
+ _ZTTSi @ 665 NONAME ABSENT
+ _ZTTSo @ 666 NONAME ABSENT
_ZTTSt10istrstream @ 667 NONAME
_ZTTSt10ostrstream @ 668 NONAME
_ZTTSt13basic_fstreamIcSt11char_traitsIcEE @ 669 NONAME ABSENT
_ZTTSt13basic_fstreamIwSt11char_traitsIwEE @ 670 NONAME ABSENT
- _ZTTSt13basic_istreamIwSt11char_traitsIwEE @ 671 NONAME
- _ZTTSt13basic_ostreamIwSt11char_traitsIwEE @ 672 NONAME
+ _ZTTSt13basic_istreamIwSt11char_traitsIwEE @ 671 NONAME ABSENT
+ _ZTTSt13basic_ostreamIwSt11char_traitsIwEE @ 672 NONAME ABSENT
_ZTTSt14basic_ifstreamIcSt11char_traitsIcEE @ 673 NONAME ABSENT
_ZTTSt14basic_ifstreamIwSt11char_traitsIwEE @ 674 NONAME ABSENT
- _ZTTSt14basic_iostreamIwSt11char_traitsIwEE @ 675 NONAME
+ _ZTTSt14basic_iostreamIwSt11char_traitsIwEE @ 675 NONAME ABSENT
_ZTTSt14basic_ofstreamIcSt11char_traitsIcEE @ 676 NONAME ABSENT
_ZTTSt14basic_ofstreamIwSt11char_traitsIwEE @ 677 NONAME ABSENT
- _ZTTSt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 678 NONAME
- _ZTTSt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 679 NONAME
- _ZTTSt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 680 NONAME
- _ZTTSt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 681 NONAME
- _ZTTSt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 682 NONAME
- _ZTTSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 683 NONAME
+ _ZTTSt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 678 NONAME ABSENT
+ _ZTTSt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 679 NONAME ABSENT
+ _ZTTSt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 680 NONAME ABSENT
+ _ZTTSt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 681 NONAME ABSENT
+ _ZTTSt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 682 NONAME ABSENT
+ _ZTTSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 683 NONAME ABSENT
_ZTTSt9strstream @ 684 NONAME
_ZTVN9stlp_priv14_Messages_implE @ 685 NONAME
_ZTVN9stlp_priv16stdio_istreambufE @ 686 NONAME
@@ -690,8 +690,8 @@
_ZTVN9stlp_priv9_MessagesE @ 689 NONAME
_ZTVNSt6locale5facetE @ 690 NONAME
_ZTVNSt8ios_base7failureE @ 691 NONAME
- _ZTVSd @ 692 NONAME
- _ZTVSo @ 693 NONAME
+ _ZTVSd @ 692 NONAME ABSENT
+ _ZTVSo @ 693 NONAME ABSENT
_ZTVSt10istrstream @ 694 NONAME
_ZTVSt10moneypunctIcLb0EE @ 695 NONAME
_ZTVSt10moneypunctIcLb1EE @ 696 NONAME
@@ -706,20 +706,20 @@
_ZTVSt12length_error @ 705 NONAME
_ZTVSt12out_of_range @ 706 NONAME
_ZTVSt12strstreambuf @ 707 NONAME
- _ZTVSt13basic_filebufIcSt11char_traitsIcEE @ 708 NONAME
- _ZTVSt13basic_filebufIwSt11char_traitsIwEE @ 709 NONAME
- _ZTVSt13basic_ostreamIwSt11char_traitsIwEE @ 710 NONAME
+ _ZTVSt13basic_filebufIcSt11char_traitsIcEE @ 708 NONAME ABSENT
+ _ZTVSt13basic_filebufIwSt11char_traitsIwEE @ 709 NONAME ABSENT
+ _ZTVSt13basic_ostreamIwSt11char_traitsIwEE @ 710 NONAME ABSENT
_ZTVSt13runtime_error @ 711 NONAME
- _ZTVSt14basic_iostreamIwSt11char_traitsIwEE @ 712 NONAME
+ _ZTVSt14basic_iostreamIwSt11char_traitsIwEE @ 712 NONAME ABSENT
_ZTVSt14codecvt_bynameIcc11_mb_state_tE @ 713 NONAME
_ZTVSt14codecvt_bynameIwc11_mb_state_tE @ 714 NONAME
_ZTVSt14collate_bynameIcE @ 715 NONAME
_ZTVSt14collate_bynameIwE @ 716 NONAME
_ZTVSt14overflow_error @ 717 NONAME
- _ZTVSt15basic_streambufIcSt11char_traitsIcEE @ 718 NONAME
- _ZTVSt15basic_streambufIwSt11char_traitsIwEE @ 719 NONAME
- _ZTVSt15basic_stringbufIcSt11char_traitsIcESaIcEE @ 720 NONAME
- _ZTVSt15basic_stringbufIwSt11char_traitsIwESaIwEE @ 721 NONAME
+ _ZTVSt15basic_streambufIcSt11char_traitsIcEE @ 718 NONAME ABSENT
+ _ZTVSt15basic_streambufIwSt11char_traitsIwEE @ 719 NONAME ABSENT
+ _ZTVSt15basic_stringbufIcSt11char_traitsIcESaIcEE @ 720 NONAME ABSENT
+ _ZTVSt15basic_stringbufIwSt11char_traitsIwESaIwEE @ 721 NONAME ABSENT
_ZTVSt15messages_bynameIcE @ 722 NONAME
_ZTVSt15messages_bynameIwE @ 723 NONAME
_ZTVSt15numpunct_bynameIcE @ 724 NONAME
@@ -731,12 +731,12 @@
_ZTVSt17moneypunct_bynameIcLb1EE @ 730 NONAME
_ZTVSt17moneypunct_bynameIwLb0EE @ 731 NONAME
_ZTVSt17moneypunct_bynameIwLb1EE @ 732 NONAME
- _ZTVSt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 733 NONAME
- _ZTVSt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 734 NONAME
- _ZTVSt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 735 NONAME
- _ZTVSt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 736 NONAME
- _ZTVSt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 737 NONAME
- _ZTVSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 738 NONAME
+ _ZTVSt18basic_stringstreamIcSt11char_traitsIcESaIcEE @ 733 NONAME ABSENT
+ _ZTVSt18basic_stringstreamIwSt11char_traitsIwESaIwEE @ 734 NONAME ABSENT
+ _ZTVSt19basic_istringstreamIcSt11char_traitsIcESaIcEE @ 735 NONAME ABSENT
+ _ZTVSt19basic_istringstreamIwSt11char_traitsIwESaIwEE @ 736 NONAME ABSENT
+ _ZTVSt19basic_ostringstreamIcSt11char_traitsIcESaIcEE @ 737 NONAME ABSENT
+ _ZTVSt19basic_ostringstreamIwSt11char_traitsIwESaIwEE @ 738 NONAME ABSENT
_ZTVSt5ctypeIcE @ 739 NONAME
_ZTVSt5ctypeIwE @ 740 NONAME
_ZTVSt7codecvtIcc11_mb_state_tE @ 741 NONAME
@@ -763,16 +763,16 @@
_ZTVSt9strstream @ 762 NONAME
_ZThn8_NSt9strstreamD0Ev @ 763 NONAME
_ZThn8_NSt9strstreamD1Ev @ 764 NONAME
- _ZThn8_NSt9strstreamD9Ev @ 765 NONAME ABSENT
+ _ZThn8_NSt9strstreamD9Ev @ 765 NONAME ABSENT
_ZTv0_n12_NSt10istrstreamD0Ev @ 766 NONAME
_ZTv0_n12_NSt10istrstreamD1Ev @ 767 NONAME
- _ZTv0_n12_NSt10istrstreamD9Ev @ 768 NONAME ABSENT
+ _ZTv0_n12_NSt10istrstreamD9Ev @ 768 NONAME ABSENT
_ZTv0_n12_NSt10ostrstreamD0Ev @ 769 NONAME
_ZTv0_n12_NSt10ostrstreamD1Ev @ 770 NONAME
- _ZTv0_n12_NSt10ostrstreamD9Ev @ 771 NONAME ABSENT
+ _ZTv0_n12_NSt10ostrstreamD9Ev @ 771 NONAME ABSENT
_ZTv0_n12_NSt9strstreamD0Ev @ 772 NONAME
_ZTv0_n12_NSt9strstreamD1Ev @ 773 NONAME
- _ZTv0_n12_NSt9strstreamD9Ev @ 774 NONAME ABSENT
+ _ZTv0_n12_NSt9strstreamD9Ev @ 774 NONAME ABSENT
_ZNK9stlp_priv9_Messages6do_getEiiiRKSs @ 775 NONAME
_ZNK9stlp_priv9_Messages7do_openERKSsRKSt6locale @ 776 NONAME
_ZNK9stlp_priv9_Messages8do_closeEi @ 777 NONAME
--- a/genericopenlibs/cppstdlib/group/libstdcpp.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/group/libstdcpp.mmp Mon May 03 14:06:43 2010 +0300
@@ -88,10 +88,6 @@
LIBRARY libpthread.lib
LIBRARY libm.lib
LIBRARY euser.lib
-// TODO: temporarily adding. A problem with SBSv2 in adding stdnew automatically?
-#ifndef WINSCW
-LIBRARY stdnew.lib
-#endif
#ifdef ARMCC_3_1
DEFFILE ../eabi/libstdcppv5.def
--- a/genericopenlibs/cppstdlib/group/stdnew.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/group/stdnew.mmp Mon May 03 14:06:43 2010 +0300
@@ -32,10 +32,6 @@
library euser.lib
-#ifndef WINSCW
-library drtaeabi.lib
-#endif
-
#ifdef GCCXML
macro __wchar_t_defined
macro __SYMBIAN_STDCPP_SUPPORT__
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_fstream.c Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_fstream.c Mon May 03 14:06:43 2010 +0300
@@ -63,18 +63,6 @@
this->_M_setup_codecvt(locale(), false);
}
-template <class _CharT, class _Traits>
-basic_filebuf<_CharT, _Traits>::~basic_filebuf() {
- this->close();
- _M_deallocate_buffers();
-}
-
-
-template <class _CharT, class _Traits>
-_STLP_TYPENAME_ON_RETURN_TYPE basic_filebuf<_CharT, _Traits>::int_type
-basic_filebuf<_CharT, _Traits>::underflow() {
- return _Underflow<_CharT, _Traits>::_M_doit(this);
-}
template <class _CharT, class _Traits>
basic_filebuf<_CharT, _Traits>*
@@ -123,284 +111,6 @@
}
-//----------------------------------------------------------------------
-// basic_filebuf<> overridden protected virtual member functions
-
-template <class _CharT, class _Traits>
-streamsize basic_filebuf<_CharT, _Traits>::showmanyc() {
- // Is there any possibility that reads can succeed?
- if (!this->is_open() || _M_in_output_mode || _M_in_error_mode)
- return -1;
- else if (_M_in_putback_mode)
- return this->egptr() - this->gptr();
- else if (_M_constant_width) {
- streamoff __pos = _M_base._M_seek(0, ios_base::cur);
- streamoff __size = _M_base._M_file_size();
- return __pos >= 0 && __size > __pos ? __size - __pos : 0;
- }
- else
- return 0;
-}
-
-
-// Make a putback position available, if necessary, by switching to a
-// special internal buffer used only for putback. The buffer is
-// [_M_pback_buf, _M_pback_buf + _S_pback_buf_size), but the base
-// class only sees a piece of it at a time. (We want to make sure
-// that we don't try to read a character that hasn't been initialized.)
-// The end of the putback buffer is always _M_pback_buf + _S_pback_buf_size,
-// but the beginning is usually not _M_pback_buf.
-template <class _CharT, class _Traits>
-__BF_int_type__
-basic_filebuf<_CharT, _Traits>::pbackfail(int_type __c) {
- const int_type __eof = traits_type::eof();
-
- // If we aren't already in input mode, pushback is impossible.
- if (!_M_in_input_mode)
- return __eof;
-
- // We can use the ordinary get buffer if there's enough space, and
- // if it's a buffer that we're allowed to write to.
- if (this->gptr() != this->eback() &&
- (traits_type::eq_int_type(__c, __eof) ||
- traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]) ||
- !_M_mmap_base)) {
- this->gbump(-1);
- if (traits_type::eq_int_type(__c, __eof) ||
- traits_type::eq(traits_type::to_char_type(__c), *this->gptr()))
- return traits_type::to_int_type(*this->gptr());
- }
- else if (!traits_type::eq_int_type(__c, __eof)) {
- // Are we in the putback buffer already?
- _CharT* __pback_end = _M_pback_buf + __STATIC_CAST(int,_S_pback_buf_size);
- if (_M_in_putback_mode) {
- // Do we have more room in the putback buffer?
- if (this->eback() != _M_pback_buf)
- this->setg(this->egptr() - 1, this->egptr() - 1, __pback_end);
- else
- return __eof; // No more room in the buffer, so fail.
- }
- else { // We're not yet in the putback buffer.
- _M_saved_eback = this->eback();
- _M_saved_gptr = this->gptr();
- _M_saved_egptr = this->egptr();
- this->setg(__pback_end - 1, __pback_end - 1, __pback_end);
- _M_in_putback_mode = true;
- }
- }
- else
- return __eof;
-
- // We have made a putback position available. Assign to it, and return.
- *this->gptr() = traits_type::to_char_type(__c);
- return __c;
-}
-
-// This member function flushes the put area, and also outputs the
-// character __c (unless __c is eof). Invariant: we always leave room
-// in the internal buffer for one character more than the base class knows
-// about. We see the internal buffer as [_M_int_buf, _M_int_buf_EOS), but
-// the base class only sees [_M_int_buf, _M_int_buf_EOS - 1).
-template <class _CharT, class _Traits>
-__BF_int_type__
-basic_filebuf<_CharT, _Traits>::overflow(int_type __c) {
- // Switch to output mode, if necessary.
- if (!_M_in_output_mode)
- if (!_M_switch_to_output_mode())
- return traits_type::eof();
-
- _CharT* __ibegin = this->_M_int_buf;
- _CharT* __iend = this->pptr();
- this->setp(_M_int_buf, _M_int_buf_EOS - 1);
-
- // Put __c at the end of the internal buffer.
- if (!traits_type::eq_int_type(__c, traits_type::eof()))
- *__iend++ = _Traits::to_char_type(__c);
-
- // For variable-width encodings, output may take more than one pass.
- while (__ibegin != __iend) {
- const _CharT* __inext = __ibegin;
- char* __enext = _M_ext_buf;
- typename _Codecvt::result __status
- = _M_codecvt->out(_M_state, __ibegin, __iend, __inext,
- _M_ext_buf, _M_ext_buf_EOS, __enext);
- if (__status == _Codecvt::noconv) {
- return _Noconv_output<_Traits>::_M_doit(this, __ibegin, __iend)
- ? traits_type::not_eof(__c)
- : _M_output_error();
- }
-
- // For a constant-width encoding we know that the external buffer
- // is large enough, so failure to consume the entire internal buffer
- // or to produce the correct number of external characters, is an error.
- // For a variable-width encoding, however, we require only that we
- // consume at least one internal character
- else if (__status != _Codecvt::error &&
- (((__inext == __iend) &&
- (__enext - _M_ext_buf == _M_width * (__iend - __ibegin))) ||
- (!_M_constant_width && __inext != __ibegin))) {
- // We successfully converted part or all of the internal buffer.
- ptrdiff_t __n = __enext - _M_ext_buf;
- if (_M_write(_M_ext_buf, __n))
- __ibegin += __inext - __ibegin;
- else
- return _M_output_error();
- }
- else
- return _M_output_error();
- }
-
- return traits_type::not_eof(__c);
-}
-
-// This member function must be called before any I/O has been
-// performed on the stream, otherwise it has no effect.
-//
-// __buf == 0 && __n == 0 means to make this stream unbuffered.
-// __buf != 0 && __n > 0 means to use __buf as the stream's internal
-// buffer, rather than the buffer that would otherwise be allocated
-// automatically. __buf must be a pointer to an array of _CharT whose
-// size is at least __n.
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>*
-basic_filebuf<_CharT, _Traits>::setbuf(_CharT* __buf, streamsize __n) {
- if (!_M_in_input_mode &&! _M_in_output_mode && !_M_in_error_mode &&
- _M_int_buf == 0) {
- if (__buf == 0 && __n == 0)
- _M_allocate_buffers(0, 1);
- else if (__buf != 0 && __n > 0)
- _M_allocate_buffers(__buf, __n);
- }
- return this;
-}
-
-template <class _CharT, class _Traits>
-__BF_pos_type__
-basic_filebuf<_CharT, _Traits>::seekoff(off_type __off,
- ios_base::seekdir __whence,
- ios_base::openmode /* dummy */) {
- if (this->is_open() &&
- (__off == 0 || (_M_constant_width && this->_M_base._M_in_binary_mode()))) {
-
- if (!_M_seek_init(__off != 0 || __whence != ios_base::cur))
- return pos_type(-1);
-
- // Seek to beginning or end, regardless of whether we're in input mode.
- if (__whence == ios_base::beg || __whence == ios_base::end)
- return _M_seek_return(_M_base._M_seek(_M_width * __off, __whence),
- _State_type());
-
- // Seek relative to current position. Complicated if we're in input mode.
- else if (__whence == ios_base::cur) {
- if (!_M_in_input_mode)
- return _M_seek_return(_M_base._M_seek(_M_width * __off, __whence),
- _State_type());
- else if (_M_mmap_base != 0) {
- // __off is relative to gptr(). We need to do a bit of arithmetic
- // to get an offset relative to the external file pointer.
- streamoff __adjust = _M_mmap_len - (this->gptr() - (_CharT*) _M_mmap_base);
-
- // if __off == 0, we do not need to exit input mode and to shift file pointer
- return __off == 0 ? pos_type(_M_base._M_seek(0, ios_base::cur) - __adjust)
- : _M_seek_return(_M_base._M_seek(__off - __adjust, ios_base::cur), _State_type());
- }
- else if (_M_constant_width) { // Get or set the position.
- streamoff __iadj = _M_width * (this->gptr() - this->eback());
-
- // Compensate for offset relative to gptr versus offset relative
- // to external pointer. For a text-oriented stream, where the
- // compensation is more than just pointer arithmetic, we may get
- // but not set the current position.
-
- if (__iadj <= _M_ext_buf_end - _M_ext_buf) {
- streamoff __eadj = _M_base._M_get_offset(_M_ext_buf + __STATIC_CAST(ptrdiff_t, __iadj), _M_ext_buf_end);
-
- return __off == 0 ? pos_type(_M_base._M_seek(0, ios_base::cur) - __eadj)
- : _M_seek_return(_M_base._M_seek(__off - __eadj, ios_base::cur), _State_type());
- }
- } else { // Get the position. Encoding is var width.
- // Get position in internal buffer.
- ptrdiff_t __ipos = this->gptr() - this->eback();
-
- // Get corresponding position in external buffer.
- _State_type __state = _M_state;
- int __epos = _M_codecvt->length(__state, _M_ext_buf, _M_ext_buf_end,
- __ipos);
-
- if (__epos >= 0) {
- // Sanity check (expensive): make sure __epos is the right answer.
- _State_type __tmp_state = _M_state;
- _Filebuf_Tmp_Buf<_CharT> __buf(__ipos);
- _CharT* __ibegin = __buf._M_ptr;
- _CharT* __inext = __ibegin;
-
- const char* __dummy;
- typename _Codecvt::result __status
- = _M_codecvt->in(__tmp_state,
- _M_ext_buf, _M_ext_buf + __epos, __dummy,
- __ibegin, __ibegin + __ipos, __inext);
- if (__status != _Codecvt::error &&
- (__status == _Codecvt::noconv ||
- (__inext == __ibegin + __ipos &&
- equal(this->eback(), this->gptr(), __ibegin, _STLP_PRIV _Eq_traits<traits_type>())))) {
- // Get the current position (at the end of the external buffer),
- // then adjust it. Again, it might be a text-oriented stream.
- streamoff __cur = _M_base._M_seek(0, ios_base::cur);
- streamoff __adj =
- _M_base._M_get_offset(_M_ext_buf, _M_ext_buf + __epos) -
- _M_base._M_get_offset(_M_ext_buf, _M_ext_buf_end);
- if (__cur != -1 && __cur + __adj >= 0)
- return __off == 0 ? pos_type(__cur + __adj)
- : _M_seek_return(__cur + __adj, __state);
- //return _M_seek_return(__cur + __adj, __state);
- }
- // We failed the sanity check here.
- }
- }
- }
- // Unrecognized value for __whence here.
- }
-
- return pos_type(-1);
-}
-
-
-template <class _CharT, class _Traits>
-__BF_pos_type__
-basic_filebuf<_CharT, _Traits>::seekpos(pos_type __pos,
- ios_base::openmode /* dummy */) {
- if (this->is_open()) {
- if (!_M_seek_init(true))
- return pos_type(-1);
-
- streamoff __off = off_type(__pos);
- if (__off != -1 && _M_base._M_seek(__off, ios_base::beg) != -1) {
- _M_state = __pos.state();
- return _M_seek_return(__off, __pos.state());
- }
- }
-
- return pos_type(-1);
-}
-
-
-template <class _CharT, class _Traits>
-int basic_filebuf<_CharT, _Traits>::sync() {
- if (_M_in_output_mode)
- return traits_type::eq_int_type(this->overflow(traits_type::eof()),
- traits_type::eof()) ? -1 : 0;
- return 0;
-}
-
-
-// Change the filebuf's locale. This member function has no effect
-// unless it is called before any I/O is performed on the stream.
-template <class _CharT, class _Traits>
-void basic_filebuf<_CharT, _Traits>::imbue(const locale& __loc) {
- if (!_M_in_input_mode && !_M_in_output_mode && !_M_in_error_mode) {
- this->_M_setup_codecvt(__loc);
- }
-}
//----------------------------------------------------------------------
// basic_filebuf<> helper functions.
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_fstream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_fstream.h Mon May 03 14:06:43 2010 +0300
@@ -185,6 +185,15 @@
_STLP_TEMPLATE_NULL class _Underflow< char, char_traits<char> >;
+// public:
+// helper class.
+template <class _CharT>
+struct _Filebuf_Tmp_Buf {
+ _CharT* _M_ptr;
+ _Filebuf_Tmp_Buf(ptrdiff_t __n) : _M_ptr(0) { _M_ptr = new _CharT[__n]; }
+ ~_Filebuf_Tmp_Buf() { delete[] _M_ptr; }
+};
+
template <class _CharT, class _Traits>
class basic_filebuf : public basic_streambuf<_CharT, _Traits> {
public: // Types.
@@ -200,7 +209,11 @@
public: // Constructors, destructor.
basic_filebuf();
- ~basic_filebuf();
+ ~basic_filebuf()
+ {
+ this->close();
+ _M_deallocate_buffers();
+ }
public: // Opening and closing files.
bool is_open() const { return _M_base.__is_open(); }
@@ -236,22 +249,267 @@
_Self* close();
-protected: // Virtual functions from basic_streambuf.
- virtual streamsize showmanyc();
- virtual int_type underflow();
+protected: // Virtual functions from basic_streambuf.
+
+ virtual streamsize showmanyc() {
+
+ // Is there any possibility that reads can succeed?
+ if (!this->is_open() || _M_in_output_mode || _M_in_error_mode)
+ return -1;
+ else if (_M_in_putback_mode)
+ return this->egptr() - this->gptr();
+ else if (_M_constant_width) {
+ streamoff __pos = _M_base._M_seek(0, ios_base::cur);
+ streamoff __size = _M_base._M_file_size();
+ return __pos >= 0 && __size > __pos ? __size - __pos : 0;
+ }
+ else
+ return 0;
+
+ }
+ virtual int_type underflow() {
+
+ return _Underflow<_CharT, _Traits>::_M_doit(this);
+
+ }
+
+ virtual int_type pbackfail(int_type __c= traits_type::eof()) {
+
+ const int_type __eof = traits_type::eof();
+
+ // If we aren't already in input mode, pushback is impossible.
+ if (!_M_in_input_mode)
+ return __eof;
- virtual int_type pbackfail(int_type = traits_type::eof());
- virtual int_type overflow(int_type = traits_type::eof());
+ // We can use the ordinary get buffer if there's enough space, and
+ // if it's a buffer that we're allowed to write to.
+ if (this->gptr() != this->eback() &&
+ (traits_type::eq_int_type(__c, __eof) ||
+ traits_type::eq(traits_type::to_char_type(__c), this->gptr()[-1]) ||
+ !_M_mmap_base)) {
+ this->gbump(-1);
+ if (traits_type::eq_int_type(__c, __eof) ||
+ traits_type::eq(traits_type::to_char_type(__c), *this->gptr()))
+ return traits_type::to_int_type(*this->gptr());
+ }
+ else if (!traits_type::eq_int_type(__c, __eof)) {
+ // Are we in the putback buffer already?
+ _CharT* __pback_end = _M_pback_buf + __STATIC_CAST(int,_S_pback_buf_size);
+ if (_M_in_putback_mode) {
+ // Do we have more room in the putback buffer?
+ if (this->eback() != _M_pback_buf)
+ this->setg(this->egptr() - 1, this->egptr() - 1, __pback_end);
+ else
+ return __eof; // No more room in the buffer, so fail.
+ }
+ else { // We're not yet in the putback buffer.
+ _M_saved_eback = this->eback();
+ _M_saved_gptr = this->gptr();
+ _M_saved_egptr = this->egptr();
+ this->setg(__pback_end - 1, __pback_end - 1, __pback_end);
+ _M_in_putback_mode = true;
+ }
+ }
+ else
+ return __eof;
+
+ // We have made a putback position available. Assign to it, and return.
+ *this->gptr() = traits_type::to_char_type(__c);
+ return __c;
+
+ }
+
+ virtual int_type overflow(int_type __c) {
+
+ // Switch to output mode, if necessary.
+ if (!_M_in_output_mode)
+ if (!_M_switch_to_output_mode())
+ return traits_type::eof();
+
+ _CharT* __ibegin = this->_M_int_buf;
+ _CharT* __iend = this->pptr();
+ this->setp(_M_int_buf, _M_int_buf_EOS - 1);
+
+ // Put __c at the end of the internal buffer.
+ if (!traits_type::eq_int_type(__c, traits_type::eof()))
+ *__iend++ = _Traits::to_char_type(__c);
+
+ // For variable-width encodings, output may take more than one pass.
+ while (__ibegin != __iend) {
+ const _CharT* __inext = __ibegin;
+ char* __enext = _M_ext_buf;
+ typename _Codecvt::result __status
+ = _M_codecvt->out(_M_state, __ibegin, __iend, __inext,
+ _M_ext_buf, _M_ext_buf_EOS, __enext);
+ if (__status == _Codecvt::noconv) {
+ return _Noconv_output<_Traits>::_M_doit(this, __ibegin, __iend)
+ ? traits_type::not_eof(__c)
+ : _M_output_error();
+ }
+
+ // For a constant-width encoding we know that the external buffer
+ // is large enough, so failure to consume the entire internal buffer
+ // or to produce the correct number of external characters, is an error.
+ // For a variable-width encoding, however, we require only that we
+ // consume at least one internal character
+ else if (__status != _Codecvt::error &&
+ (((__inext == __iend) &&
+ (__enext - _M_ext_buf == _M_width * (__iend - __ibegin))) ||
+ (!_M_constant_width && __inext != __ibegin))) {
+ // We successfully converted part or all of the internal buffer.
+ ptrdiff_t __n = __enext - _M_ext_buf;
+ if (_M_write(_M_ext_buf, __n))
+ __ibegin += __inext - __ibegin;
+ else
+ return _M_output_error();
+ }
+ else
+ return _M_output_error();
+ }
+
+ return traits_type::not_eof(__c);
+
+ }
+
+ virtual basic_streambuf<_CharT, _Traits>* setbuf(_CharT* __buf, streamsize __n) {
- virtual basic_streambuf<_CharT, _Traits>* setbuf(char_type*, streamsize);
- virtual pos_type seekoff(off_type, ios_base::seekdir,
- ios_base::openmode = ios_base::in | ios_base::out);
- virtual pos_type seekpos(pos_type,
- ios_base::openmode = ios_base::in | ios_base::out);
+ if (!_M_in_input_mode &&! _M_in_output_mode && !_M_in_error_mode &&
+ _M_int_buf == 0) {
+ if (__buf == 0 && __n == 0)
+ _M_allocate_buffers(0, 1);
+ else if (__buf != 0 && __n > 0)
+ _M_allocate_buffers(__buf, __n);
+ }
+ return this;
+
+ }
+
+ virtual pos_type seekoff(off_type __off,
+ ios_base::seekdir __whence,
+ ios_base::openmode /* dummy */) {
+
+ if (this->is_open() &&
+ (__off == 0 || (_M_constant_width && this->_M_base._M_in_binary_mode()))) {
+
+ if (!_M_seek_init(__off != 0 || __whence != ios_base::cur))
+ return pos_type(-1);
+
+ // Seek to beginning or end, regardless of whether we're in input mode.
+ if (__whence == ios_base::beg || __whence == ios_base::end)
+ return _M_seek_return(_M_base._M_seek(_M_width * __off, __whence),
+ _State_type());
+
+ // Seek relative to current position. Complicated if we're in input mode.
+ else if (__whence == ios_base::cur) {
+ if (!_M_in_input_mode)
+ return _M_seek_return(_M_base._M_seek(_M_width * __off, __whence),
+ _State_type());
+ else if (_M_mmap_base != 0) {
+ // __off is relative to gptr(). We need to do a bit of arithmetic
+ // to get an offset relative to the external file pointer.
+ streamoff __adjust = _M_mmap_len - (this->gptr() - (_CharT*) _M_mmap_base);
+
+ // if __off == 0, we do not need to exit input mode and to shift file pointer
+ return __off == 0 ? pos_type(_M_base._M_seek(0, ios_base::cur) - __adjust)
+ : _M_seek_return(_M_base._M_seek(__off - __adjust, ios_base::cur), _State_type());
+ }
+ else if (_M_constant_width) { // Get or set the position.
+ streamoff __iadj = _M_width * (this->gptr() - this->eback());
+
+ // Compensate for offset relative to gptr versus offset relative
+ // to external pointer. For a text-oriented stream, where the
+ // compensation is more than just pointer arithmetic, we may get
+ // but not set the current position.
+
+ if (__iadj <= _M_ext_buf_end - _M_ext_buf) {
+ streamoff __eadj = _M_base._M_get_offset(_M_ext_buf + __STATIC_CAST(ptrdiff_t, __iadj), _M_ext_buf_end);
+
+ return __off == 0 ? pos_type(_M_base._M_seek(0, ios_base::cur) - __eadj)
+ : _M_seek_return(_M_base._M_seek(__off - __eadj, ios_base::cur), _State_type());
+ }
+ } else { // Get the position. Encoding is var width.
+ // Get position in internal buffer.
+ ptrdiff_t __ipos = this->gptr() - this->eback();
+
+ // Get corresponding position in external buffer.
+ _State_type __state = _M_state;
+ int __epos = _M_codecvt->length(__state, _M_ext_buf, _M_ext_buf_end,
+ __ipos);
- virtual int sync();
- virtual void imbue(const locale&);
+ if (__epos >= 0) {
+ // Sanity check (expensive): make sure __epos is the right answer.
+ _State_type __tmp_state = _M_state;
+ _Filebuf_Tmp_Buf<_CharT> __buf(__ipos);
+ _CharT* __ibegin = __buf._M_ptr;
+ _CharT* __inext = __ibegin;
+
+ const char* __dummy;
+ typename _Codecvt::result __status
+ = _M_codecvt->in(__tmp_state,
+ _M_ext_buf, _M_ext_buf + __epos, __dummy,
+ __ibegin, __ibegin + __ipos, __inext);
+ if (__status != _Codecvt::error &&
+ (__status == _Codecvt::noconv ||
+ (__inext == __ibegin + __ipos &&
+ equal(this->eback(), this->gptr(), __ibegin, _STLP_PRIV _Eq_traits<traits_type>())))) {
+ // Get the current position (at the end of the external buffer),
+ // then adjust it. Again, it might be a text-oriented stream.
+ streamoff __cur = _M_base._M_seek(0, ios_base::cur);
+ streamoff __adj =
+ _M_base._M_get_offset(_M_ext_buf, _M_ext_buf + __epos) -
+ _M_base._M_get_offset(_M_ext_buf, _M_ext_buf_end);
+ if (__cur != -1 && __cur + __adj >= 0)
+ return __off == 0 ? pos_type(__cur + __adj)
+ : _M_seek_return(__cur + __adj, __state);
+ //return _M_seek_return(__cur + __adj, __state);
+ }
+ // We failed the sanity check here.
+ }
+ }
+ }
+ // Unrecognized value for __whence here.
+ }
+
+ return pos_type(-1);
+ }
+
+ virtual pos_type seekpos(pos_type __pos,
+ ios_base::openmode /* dummy */) {
+
+ if (this->is_open()) {
+ if (!_M_seek_init(true))
+ return pos_type(-1);
+
+ streamoff __off = off_type(__pos);
+ if (__off != -1 && _M_base._M_seek(__off, ios_base::beg) != -1) {
+ _M_state = __pos.state();
+ return _M_seek_return(__off, __pos.state());
+ }
+ }
+
+ return pos_type(-1);
+
+ }
+
+ virtual int sync() {
+
+ if (_M_in_output_mode)
+ return traits_type::eq_int_type(this->overflow(traits_type::eof()),
+ traits_type::eof()) ? -1 : 0;
+ return 0;
+
+ }
+
+ virtual void imbue(const locale& __loc) {
+
+ if (!_M_in_input_mode && !_M_in_output_mode && !_M_in_error_mode) {
+ this->_M_setup_codecvt(__loc);
+ }
+
+ }
+
+
private: // Helper functions.
// Precondition: we are currently in putback input mode. Effect:
@@ -379,16 +637,6 @@
# endif
#endif /* _STLP_USE_TEMPLATE_EXPORT */
-// public:
-// helper class.
-template <class _CharT>
-struct _Filebuf_Tmp_Buf {
- _CharT* _M_ptr;
- _Filebuf_Tmp_Buf(ptrdiff_t __n) : _M_ptr(0) { _M_ptr = new _CharT[__n]; }
- ~_Filebuf_Tmp_Buf() { delete[] _M_ptr; }
-};
-
-
//
// This class had to be designed very carefully to work
// with Visual C++.
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_istream.c Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_istream.c Mon May 03 14:06:43 2010 +0300
@@ -1403,6 +1403,7 @@
// basic_iostream<> class
// ----------------------------------------------------------------
+
template <class _CharT, class _Traits>
basic_iostream<_CharT, _Traits>
::basic_iostream(basic_streambuf<_CharT, _Traits>* __buf)
@@ -1412,9 +1413,6 @@
this->init(__buf);
}
-template <class _CharT, class _Traits>
-basic_iostream<_CharT, _Traits>::~basic_iostream()
-{}
_STLP_END_NAMESPACE
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_istream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_istream.h Mon May 03 14:06:43 2010 +0300
@@ -334,7 +334,7 @@
typedef basic_ios<_CharT, _Traits> _Basic_ios;
explicit basic_iostream(basic_streambuf<_CharT, _Traits>* __buf);
- virtual ~basic_iostream();
+ virtual ~basic_iostream(){}
};
# if defined (_STLP_USE_TEMPLATE_EXPORT)
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_ostream.c Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_ostream.c Mon May 03 14:06:43 2010 +0300
@@ -33,15 +33,14 @@
// Constructor, destructor
+
template <class _CharT, class _Traits>
basic_ostream<_CharT, _Traits>::basic_ostream(basic_streambuf<_CharT, _Traits>* __buf)
: basic_ios<_CharT, _Traits>() {
this->init(__buf);
}
-template <class _CharT, class _Traits>
-basic_ostream<_CharT, _Traits>::~basic_ostream()
-{}
+
// Output directly from a streambuf.
template <class _CharT, class _Traits>
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_ostream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_ostream.h Mon May 03 14:06:43 2010 +0300
@@ -68,8 +68,13 @@
typedef basic_ios<_CharT, _Traits> _Basic_ios;
public: // Constructor and destructor.
+
explicit basic_ostream(basic_streambuf<_CharT, _Traits>* __buf);
- ~basic_ostream();
+
+
+
+ ~basic_ostream() {}
+
public: // Hooks for manipulators.
typedef basic_ios<_CharT, _Traits>& (_STLP_CALL *__ios_fn)(basic_ios<_CharT, _Traits>&);
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_sstream.c Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_sstream.c Mon May 03 14:06:43 2010 +0300
@@ -54,9 +54,7 @@
_M_set_ptrs();
}
-template <class _CharT, class _Traits, class _Alloc>
-basic_stringbuf<_CharT, _Traits, _Alloc>::~basic_stringbuf()
-{}
+
// Set the underlying string to a new value.
template <class _CharT, class _Traits, class _Alloc>
@@ -89,355 +87,8 @@
}
}
-// Precondition: gptr() >= egptr(). Returns a character, if one is available.
-template <class _CharT, class _Traits, class _Alloc>
-__BSB_int_type__
-basic_stringbuf<_CharT, _Traits, _Alloc>::underflow() {
- return this->gptr() != this->egptr()
- ? _Traits::to_int_type(*this->gptr())
- : _Traits::eof();
-}
-
-// Precondition: gptr() >= egptr().
-template <class _CharT, class _Traits, class _Alloc>
-__BSB_int_type__
-basic_stringbuf<_CharT, _Traits, _Alloc>::uflow() {
- if (this->gptr() != this->egptr()) {
- int_type __c = _Traits::to_int_type(*this->gptr());
- this->gbump(1);
- return __c;
- }
- else
- return _Traits::eof();
-}
-
-template <class _CharT, class _Traits, class _Alloc>
-__BSB_int_type__
-basic_stringbuf<_CharT, _Traits, _Alloc>::pbackfail(int_type __c) {
- if (this->gptr() != this->eback()) {
- if (!_Traits::eq_int_type(__c, _Traits::eof())) {
- if (_Traits::eq(_Traits::to_char_type(__c), this->gptr()[-1])) {
- this->gbump(-1);
- return __c;
- }
- else if (_M_mode & ios_base::out) {
- this->gbump(-1);
- *this->gptr() = _Traits::to_char_type(__c);
- return __c;
- }
- else
- return _Traits::eof();
- }
- else {
- this->gbump(-1);
- return _Traits::not_eof(__c);
- }
- }
- else
- return _Traits::eof();
-}
-
-template <class _CharT, class _Traits, class _Alloc>
-__BSB_int_type__
-basic_stringbuf<_CharT, _Traits, _Alloc>::overflow(int_type __c) {
- // fbp : reverse order of "ifs" to pass Dietmar's test.
- // Apparently, standard allows overflow with eof even for read-only streams.
- if (!_Traits::eq_int_type(__c, _Traits::eof())) {
- if (_M_mode & ios_base::out) {
- if (!(_M_mode & ios_base::in)) {
- // It's a write-only streambuf, so we can use special append buffer.
- if (this->pptr() == this->epptr())
- this->_M_append_buffer();
-
- if (this->pptr() != this->epptr()) {
- *this->pptr() = _Traits::to_char_type(__c);
- this->pbump(1);
- return __c;
- }
- else
- return _Traits::eof();
- }
- else {
- // We're not using a special append buffer, just the string itself.
- if (this->pptr() == this->epptr()) {
- ptrdiff_t __offset = this->gptr() - this->eback();
- _M_str.push_back(_Traits::to_char_type(__c));
-
- _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
- size_t __data_size = _M_str.size();
-
- this->setg(__data_ptr, __data_ptr + __offset, __data_ptr+__data_size);
- this->setp(__data_ptr, __data_ptr + __data_size);
- this->pbump((int)__data_size);
- return __c;
- }
- else {
- *this->pptr() = _Traits::to_char_type(__c);
- this->pbump(1);
- return __c;
- }
- }
- }
- else // Overflow always fails if it's read-only
- return _Traits::eof();
- }
- else // __c is EOF, so we don't have to do anything
- return _Traits::not_eof(__c);
-}
-
-template <class _CharT, class _Traits, class _Alloc>
-streamsize
-basic_stringbuf<_CharT, _Traits, _Alloc>::xsputn(const char_type* __s,
- streamsize __n) {
- streamsize __nwritten = 0;
-
- if ((_M_mode & ios_base::out) && __n > 0) {
- // If the put pointer is somewhere in the middle of the string,
- // then overwrite instead of append.
- if (this->pbase() == _M_str.data() ) {
- ptrdiff_t __avail = _M_str.data() + _M_str.size() - this->pptr();
- if (__avail > __n) {
- _Traits::copy(this->pptr(), __s, __STATIC_CAST(size_t, __n));
- this->pbump((int)__n);
- return __n;
- }
- else {
- _Traits::copy(this->pptr(), __s, __avail);
- __nwritten += __avail;
- __n -= __avail;
- __s += __avail;
- this->setp(_M_Buf, _M_Buf + __STATIC_CAST(int,_S_BufSiz));
- }
- }
-
- // At this point we know we're appending.
- if (_M_mode & ios_base::in) {
- ptrdiff_t __get_offset = this->gptr() - this->eback();
- _M_str.append(__s, __s + __STATIC_CAST(ptrdiff_t, __n));
-
- _CharT* __data_ptr = __CONST_CAST(_CharT*, _M_str.data());
- size_t __data_size = _M_str.size();
-
- this->setg(__data_ptr, __data_ptr + __get_offset, __data_ptr + __data_size);
- this->setp(__data_ptr, __data_ptr + __data_size);
- this->pbump((int)__data_size);
- }
- else {
- _M_append_buffer();
- _M_str.append(__s, __s + __STATIC_CAST(ptrdiff_t, __n));
- }
-
- __nwritten += __n;
- }
-
- return __nwritten;
-}
-
-template <class _CharT, class _Traits, class _Alloc>
-streamsize
-basic_stringbuf<_CharT, _Traits, _Alloc>::_M_xsputnc(char_type __c,
- streamsize __n) {
- streamsize __nwritten = 0;
-
- if ((_M_mode & ios_base::out) && __n > 0) {
- // If the put pointer is somewhere in the middle of the string,
- // then overwrite instead of append.
- if (this->pbase() == _M_str.data()) {
- ptrdiff_t __avail = _M_str.data() + _M_str.size() - this->pptr();
- if (__avail > __n) {
- _Traits::assign(this->pptr(), __STATIC_CAST(size_t, __n), __c);
- this->pbump(__STATIC_CAST(int, __n));
- return __n;
- }
- else {
- _Traits::assign(this->pptr(), __avail, __c);
- __nwritten += __avail;
- __n -= __avail;
- this->setp(_M_Buf, _M_Buf + __STATIC_CAST(int,_S_BufSiz));
- }
- }
-
- // At this point we know we're appending.
- size_t __app_size = sizeof(streamsize) > sizeof(size_t) ? __STATIC_CAST(size_t, (min)(__n, __STATIC_CAST(streamsize, _M_str.max_size())))
- : __STATIC_CAST(size_t, __n);
- if (this->_M_mode & ios_base::in) {
- ptrdiff_t __get_offset = this->gptr() - this->eback();
- _M_str.append(__app_size, __c);
- _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
- size_t __data_size = _M_str.size();
- this->setg(__data_ptr, __data_ptr + __get_offset, __data_ptr + __data_size);
- this->setp(__data_ptr, __data_ptr + __data_size);
- this->pbump((int)__data_size);
- }
- else {
- _M_append_buffer();
- _M_str.append(__app_size, __c);
- }
-
- __nwritten += __app_size;
- }
-
- return __nwritten;
-}
-
-// According to the C++ standard the effects of setbuf are implementation
-// defined, except that setbuf(0, 0) has no effect. In this implementation,
-// setbuf(<anything>, n), for n > 0, calls reserve(n) on the underlying
-// string.
-template <class _CharT, class _Traits, class _Alloc>
-basic_streambuf<_CharT, _Traits>*
-basic_stringbuf<_CharT, _Traits, _Alloc>::setbuf(_CharT*, streamsize __n) {
- if (__n > 0) {
- bool __do_get_area = false;
- bool __do_put_area = false;
- ptrdiff_t __offg = 0;
- ptrdiff_t __offp = 0;
-
- if (this->pbase() == _M_str.data()) {
- __do_put_area = true;
- __offp = this->pptr() - this->pbase();
- }
-
- if (this->eback() == _M_str.data()) {
- __do_get_area = true;
- __offg = this->gptr() - this->eback();
- }
-
- if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
- _M_append_buffer();
-
- _M_str.reserve(sizeof(streamsize) > sizeof(size_t) ? __STATIC_CAST(size_t, (min)(__n, __STATIC_CAST(streamsize, _M_str.max_size())))
- : __STATIC_CAST(size_t, __n));
-
- _CharT* __data_ptr = __CONST_CAST(_CharT*, _M_str.data());
- size_t __data_size = _M_str.size();
-
- if (__do_get_area) {
- this->setg(__data_ptr, __data_ptr + __offg, __data_ptr + __data_size);
- }
-
- if (__do_put_area) {
- this->setp(__data_ptr, __data_ptr + __data_size);
- this->pbump((int)__offp);
- }
- }
-
- return this;
-}
-
-template <class _CharT, class _Traits, class _Alloc>
-__BSB_pos_type__
-basic_stringbuf<_CharT, _Traits, _Alloc>
- ::seekoff(off_type __off,
- ios_base::seekdir __dir,
- ios_base::openmode __mode) {
- __mode &= _M_mode;
-
- bool __imode = (__mode & ios_base::in) != 0;
- bool __omode = (__mode & ios_base::out) != 0;
-
- if ( !(__imode || __omode) )
- return pos_type(off_type(-1));
-
- if ( (__imode && (this->gptr() == 0)) || (__omode && (this->pptr() == 0)) )
- return pos_type(off_type(-1));
-
-#ifndef SYMBIAN_OE_ENHANCED_LOCALE_SUPPORT
- if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
- _M_append_buffer();
-#endif
-
- streamoff __newoff;
- switch(__dir) {
- case ios_base::beg:
- __newoff = 0;
- break;
- case ios_base::end:
- __newoff = _M_str.size();
- break;
- case ios_base::cur:
- __newoff = __imode ? this->gptr() - this->eback() : this->pptr() - this->pbase();
-#ifdef SYMBIAN_OE_ENHANCED_LOCALE_SUPPORT
- if ( __off == 0 ) {
- return pos_type(__newoff);
- }
-#endif
- break;
- default:
- return pos_type(off_type(-1));
- }
-
- __off += __newoff;
-#ifdef SYMBIAN_OE_ENHANCED_LOCALE_SUPPORT
- _CharT* __data_ptr = __CONST_CAST(_CharT*, _M_str.data());
- size_t __data_size = _M_str.size();
-#endif
-
- if (__imode) {
- ptrdiff_t __n = this->egptr() - this->eback();
-
- if (__off < 0 || __off > __n)
- return pos_type(off_type(-1));
- this->setg(this->eback(), this->eback() + __STATIC_CAST(ptrdiff_t, __off),
- this->eback() + __STATIC_CAST(ptrdiff_t, __n));
- }
-
- if (__omode) {
- ptrdiff_t __n = this->epptr() - this->pbase();
-
- if (__off < 0 || __off > __n)
- return pos_type(off_type(-1));
-#ifdef SYMBIAN_OE_ENHANCED_LOCALE_SUPPORT
- this->setp(__data_ptr, __data_ptr+__data_size);
-#else
- this->setp(this->pbase(), this->pbase() + __n);
-#endif
- this->pbump((int)__off);
- }
-
- return pos_type(__off);
-}
-
-template <class _CharT, class _Traits, class _Alloc>
-__BSB_pos_type__
-basic_stringbuf<_CharT, _Traits, _Alloc>
- ::seekpos(pos_type __pos, ios_base::openmode __mode) {
- __mode &= _M_mode;
-
- bool __imode = (__mode & ios_base::in) != 0;
- bool __omode = (__mode & ios_base::out) != 0;
-
- if ( !(__imode || __omode) )
- return pos_type(off_type(-1));
-
- if ( (__imode && (this->gptr() == 0)) || (__omode && (this->pptr() == 0)) )
- return pos_type(off_type(-1));
-
- const off_type __n = __pos - pos_type(off_type(0));
- if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
- _M_append_buffer();
-
- if (__imode) {
- if (__n < 0 || __n > this->egptr() - this->eback())
- return pos_type(off_type(-1));
- this->setg(this->eback(), this->eback() + __STATIC_CAST(ptrdiff_t, __n), this->egptr());
- }
-
- if (__omode) {
- if (__n < 0 || size_t(__n) > _M_str.size())
- return pos_type(off_type(-1));
-
- _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
- size_t __data_size = _M_str.size();
-
- this->setp(__data_ptr, __data_ptr+__data_size);
- this->pbump((int)__n);
- }
-
- return __pos;
-}
// This is declared as a const member function because it is
// called by basic_stringbuf<>::str(). Precondition: this is a
@@ -491,9 +142,7 @@
this->init(&_M_buf);
}
-template <class _CharT, class _Traits, class _Alloc>
-basic_istringstream<_CharT, _Traits, _Alloc>::~basic_istringstream()
-{}
+
//----------------------------------------------------------------------
// Non-inline ostringstream member functions.
@@ -514,9 +163,7 @@
this->init(&_M_buf);
}
-template <class _CharT, class _Traits, class _Alloc>
-basic_ostringstream<_CharT, _Traits, _Alloc>::~basic_ostringstream()
-{}
+
//----------------------------------------------------------------------
// Non-inline stringstream member functions.
@@ -535,9 +182,10 @@
this->init(&_M_buf);
}
-template <class _CharT, class _Traits, class _Alloc>
-basic_stringstream<_CharT, _Traits, _Alloc>::~basic_stringstream()
-{}
+
+
+
+
_STLP_END_NAMESPACE
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_sstream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_sstream.h Mon May 03 14:06:43 2010 +0300
@@ -69,30 +69,343 @@
= ios_base::in | ios_base::out);
explicit basic_stringbuf(const _String& __s, ios_base::openmode __mode
= ios_base::in | ios_base::out);
- virtual ~basic_stringbuf();
+ virtual ~basic_stringbuf(){}
public: // Get or set the string.
_String str() const { _M_append_buffer(); return _M_str; }
void str(const _String& __s);
protected: // Overridden virtual member functions.
- virtual int_type underflow();
- virtual int_type uflow();
- virtual int_type pbackfail(int_type __c);
- virtual int_type overflow(int_type __c);
+
+ // Precondition: gptr() >= egptr(). Returns a character, if one is available.
+ virtual int_type underflow() {
+ return this->gptr() != this->egptr()
+ ? _Traits::to_int_type(*this->gptr())
+ : _Traits::eof();
+ }
+
+ virtual int_type uflow() {
+ if (this->gptr() != this->egptr()) {
+ int_type __c = _Traits::to_int_type(*this->gptr());
+ this->gbump(1);
+ return __c;
+ }
+ else
+ return _Traits::eof();
+ }
+
+ virtual int_type pbackfail(int_type __c) {
+ if (this->gptr() != this->eback()) {
+ if (!_Traits::eq_int_type(__c, _Traits::eof())) {
+ if (_Traits::eq(_Traits::to_char_type(__c), this->gptr()[-1])) {
+ this->gbump(-1);
+ return __c;
+ }
+ else if (_M_mode & ios_base::out) {
+ this->gbump(-1);
+ *this->gptr() = _Traits::to_char_type(__c);
+ return __c;
+ }
+ else
+ return _Traits::eof();
+ }
+ else {
+ this->gbump(-1);
+ return _Traits::not_eof(__c);
+ }
+ }
+ else
+ return _Traits::eof();
+ }
+
+ virtual int_type overflow(int_type __c) {
+ // fbp : reverse order of "ifs" to pass Dietmar's test.
+ // Apparently, standard allows overflow with eof even for read-only streams.
+ if (!_Traits::eq_int_type(__c, _Traits::eof())) {
+ if (_M_mode & ios_base::out) {
+ if (!(_M_mode & ios_base::in)) {
+ // It's a write-only streambuf, so we can use special append buffer.
+ if (this->pptr() == this->epptr())
+ this->_M_append_buffer();
+
+ if (this->pptr() != this->epptr()) {
+ *this->pptr() = _Traits::to_char_type(__c);
+ this->pbump(1);
+ return __c;
+ }
+ else
+ return _Traits::eof();
+ }
+ else {
+ // We're not using a special append buffer, just the string itself.
+ if (this->pptr() == this->epptr()) {
+ ptrdiff_t __offset = this->gptr() - this->eback();
+ _M_str.push_back(_Traits::to_char_type(__c));
+
+ _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+ size_t __data_size = _M_str.size();
+
+ this->setg(__data_ptr, __data_ptr + __offset, __data_ptr+__data_size);
+ this->setp(__data_ptr, __data_ptr + __data_size);
+ this->pbump((int)__data_size);
+ return __c;
+ }
+ else {
+ *this->pptr() = _Traits::to_char_type(__c);
+ this->pbump(1);
+ return __c;
+ }
+ }
+ }
+ else // Overflow always fails if it's read-only
+ return _Traits::eof();
+ }
+ else // __c is EOF, so we don't have to do anything
+ return _Traits::not_eof(__c);
+ }
+
int_type pbackfail() {return pbackfail(_Traits::eof());}
int_type overflow() {return overflow(_Traits::eof());}
- virtual streamsize xsputn(const char_type* __s, streamsize __n);
- virtual streamsize _M_xsputnc(char_type __c, streamsize __n);
+
+ virtual streamsize xsputn(const char_type* __s, streamsize __n) {
+ streamsize __nwritten = 0;
+
+ if ((_M_mode & ios_base::out) && __n > 0) {
+ // If the put pointer is somewhere in the middle of the string,
+ // then overwrite instead of append.
+ if (this->pbase() == _M_str.data() ) {
+ ptrdiff_t __avail = _M_str.data() + _M_str.size() - this->pptr();
+ if (__avail > __n) {
+ _Traits::copy(this->pptr(), __s, __STATIC_CAST(size_t, __n));
+ this->pbump((int)__n);
+ return __n;
+ }
+ else {
+ _Traits::copy(this->pptr(), __s, __avail);
+ __nwritten += __avail;
+ __n -= __avail;
+ __s += __avail;
+ this->setp(_M_Buf, _M_Buf + __STATIC_CAST(int,_S_BufSiz));
+ }
+ }
+
+ // At this point we know we're appending.
+ if (_M_mode & ios_base::in) {
+ ptrdiff_t __get_offset = this->gptr() - this->eback();
+ _M_str.append(__s, __s + __STATIC_CAST(ptrdiff_t, __n));
+
+ _CharT* __data_ptr = __CONST_CAST(_CharT*, _M_str.data());
+ size_t __data_size = _M_str.size();
+
+ this->setg(__data_ptr, __data_ptr + __get_offset, __data_ptr + __data_size);
+ this->setp(__data_ptr, __data_ptr + __data_size);
+ this->pbump((int)__data_size);
+ }
+ else {
+ _M_append_buffer();
+ _M_str.append(__s, __s + __STATIC_CAST(ptrdiff_t, __n));
+ }
+
+ __nwritten += __n;
+ }
+
+ return __nwritten;
+ }
+
+ virtual streamsize _M_xsputnc(char_type __c, streamsize __n) {
+ streamsize __nwritten = 0;
- virtual _Base* setbuf(_CharT* __buf, streamsize __n);
+ if ((_M_mode & ios_base::out) && __n > 0) {
+ // If the put pointer is somewhere in the middle of the string,
+ // then overwrite instead of append.
+ if (this->pbase() == _M_str.data()) {
+ ptrdiff_t __avail = _M_str.data() + _M_str.size() - this->pptr();
+ if (__avail > __n) {
+ _Traits::assign(this->pptr(), __STATIC_CAST(size_t, __n), __c);
+ this->pbump(__STATIC_CAST(int, __n));
+ return __n;
+ }
+ else {
+ _Traits::assign(this->pptr(), __avail, __c);
+ __nwritten += __avail;
+ __n -= __avail;
+ this->setp(_M_Buf, _M_Buf + __STATIC_CAST(int,_S_BufSiz));
+ }
+ }
+
+
+ // At this point we know we're appending.
+ size_t __app_size = sizeof(streamsize) > sizeof(size_t) ? __STATIC_CAST(size_t, (min)(__n, __STATIC_CAST(streamsize, _M_str.max_size())))
+ : __STATIC_CAST(size_t, __n);
+ if (this->_M_mode & ios_base::in) {
+ ptrdiff_t __get_offset = this->gptr() - this->eback();
+ _M_str.append(__app_size, __c);
+
+ _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+ size_t __data_size = _M_str.size();
+
+ this->setg(__data_ptr, __data_ptr + __get_offset, __data_ptr + __data_size);
+ this->setp(__data_ptr, __data_ptr + __data_size);
+ this->pbump((int)__data_size);
+ }
+ else {
+ _M_append_buffer();
+ _M_str.append(__app_size, __c);
+ }
+
+ __nwritten += __app_size;
+ }
+
+ return __nwritten;
+ }
+
+ virtual _Base* setbuf(_CharT*, streamsize __n) {
+ if (__n > 0) {
+ bool __do_get_area = false;
+ bool __do_put_area = false;
+ ptrdiff_t __offg = 0;
+ ptrdiff_t __offp = 0;
+
+ if (this->pbase() == _M_str.data()) {
+ __do_put_area = true;
+ __offp = this->pptr() - this->pbase();
+ }
+
+ if (this->eback() == _M_str.data()) {
+ __do_get_area = true;
+ __offg = this->gptr() - this->eback();
+ }
+
+ if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
+ _M_append_buffer();
+
+ _M_str.reserve(sizeof(streamsize) > sizeof(size_t) ? __STATIC_CAST(size_t, (min)(__n, __STATIC_CAST(streamsize, _M_str.max_size())))
+ : __STATIC_CAST(size_t, __n));
+
+ _CharT* __data_ptr = __CONST_CAST(_CharT*, _M_str.data());
+ size_t __data_size = _M_str.size();
+
+ if (__do_get_area) {
+ this->setg(__data_ptr, __data_ptr + __offg, __data_ptr + __data_size);
+ }
+
+ if (__do_put_area) {
+ this->setp(__data_ptr, __data_ptr + __data_size);
+ this->pbump((int)__offp);
+ }
+ }
+
+ return this;
+ }
virtual pos_type seekoff(off_type __off, ios_base::seekdir __dir,
- ios_base::openmode __mode
- = ios_base::in | ios_base::out);
- virtual pos_type seekpos(pos_type __pos, ios_base::openmode __mode
- = ios_base::in | ios_base::out);
+ ios_base::openmode __mode
+ = ios_base::in | ios_base::out) {
+ __mode &= _M_mode;
+
+ bool __imode = (__mode & ios_base::in) != 0;
+ bool __omode = (__mode & ios_base::out) != 0;
+
+ if ( !(__imode || __omode) )
+ return pos_type(off_type(-1));
+
+ if ( (__imode && (this->gptr() == 0)) || (__omode && (this->pptr() == 0)) )
+ return pos_type(off_type(-1));
+
+ #ifndef SYMBIAN_OE_ENHANCED_LOCALE_SUPPORT
+ if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
+ _M_append_buffer();
+ #endif
+
+ streamoff __newoff;
+ switch(__dir) {
+ case ios_base::beg:
+ __newoff = 0;
+ break;
+ case ios_base::end:
+ __newoff = _M_str.size();
+ break;
+ case ios_base::cur:
+ __newoff = __imode ? this->gptr() - this->eback() : this->pptr() - this->pbase();
+ #ifdef SYMBIAN_OE_ENHANCED_LOCALE_SUPPORT
+ if ( __off == 0 ) {
+ return pos_type(__newoff);
+ }
+ #endif
+ break;
+ default:
+ return pos_type(off_type(-1));
+ }
+
+ __off += __newoff;
+ #ifdef SYMBIAN_OE_ENHANCED_LOCALE_SUPPORT
+ _CharT* __data_ptr = __CONST_CAST(_CharT*, _M_str.data());
+ size_t __data_size = _M_str.size();
+ #endif
+
+ if (__imode) {
+ ptrdiff_t __n = this->egptr() - this->eback();
+
+ if (__off < 0 || __off > __n)
+ return pos_type(off_type(-1));
+ this->setg(this->eback(), this->eback() + __STATIC_CAST(ptrdiff_t, __off),
+ this->eback() + __STATIC_CAST(ptrdiff_t, __n));
+ }
+ if (__omode) {
+ ptrdiff_t __n = this->epptr() - this->pbase();
+
+ if (__off < 0 || __off > __n)
+ return pos_type(off_type(-1));
+ #ifdef SYMBIAN_OE_ENHANCED_LOCALE_SUPPORT
+ this->setp(__data_ptr, __data_ptr+__data_size);
+ #else
+ this->setp(this->pbase(), this->pbase() + __n);
+ #endif
+ this->pbump((int)__off);
+ }
+
+ return pos_type(__off);
+ }
+
+ virtual pos_type seekpos(pos_type __pos, ios_base::openmode __mode
+ = ios_base::in | ios_base::out) {
+ __mode &= _M_mode;
+
+ bool __imode = (__mode & ios_base::in) != 0;
+ bool __omode = (__mode & ios_base::out) != 0;
+
+ if ( !(__imode || __omode) )
+ return pos_type(off_type(-1));
+
+ if ( (__imode && (this->gptr() == 0)) || (__omode && (this->pptr() == 0)) )
+ return pos_type(off_type(-1));
+
+ const off_type __n = __pos - pos_type(off_type(0));
+ if ((_M_mode & ios_base::out) && !(_M_mode & ios_base::in))
+ _M_append_buffer();
+
+ if (__imode) {
+ if (__n < 0 || __n > this->egptr() - this->eback())
+ return pos_type(off_type(-1));
+ this->setg(this->eback(), this->eback() + __STATIC_CAST(ptrdiff_t, __n), this->egptr());
+ }
+
+ if (__omode) {
+ if (__n < 0 || size_t(__n) > _M_str.size())
+ return pos_type(off_type(-1));
+
+ _CharT* __data_ptr = __CONST_CAST(_CharT*,_M_str.data());
+ size_t __data_size = _M_str.size();
+
+ this->setp(__data_ptr, __data_ptr+__data_size);
+ this->pbump((int)__n);
+ }
+
+ return __pos;
+ }
+
+
private: // Helper functions.
// Append the internal buffer to the string if necessary.
void _M_append_buffer() const;
@@ -134,7 +447,7 @@
basic_istringstream(ios_base::openmode __mode = ios_base::in);
basic_istringstream(const _String& __str,
ios_base::openmode __mode = ios_base::in);
- ~basic_istringstream();
+ ~basic_istringstream(){}
public: // Member functions
@@ -177,7 +490,7 @@
basic_ostringstream(ios_base::openmode __mode = ios_base::out);
basic_ostringstream(const _String& __str,
ios_base::openmode __mode = ios_base::out);
- ~basic_ostringstream();
+ ~basic_ostringstream(){}
public: // Member functions.
@@ -223,7 +536,7 @@
basic_stringstream(openmode __mod = ios_base::in | ios_base::out);
basic_stringstream(const _String& __str,
openmode __mod = ios_base::in | ios_base::out);
- ~basic_stringstream();
+ ~basic_stringstream(){}
public: // Member functions.
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_streambuf.c Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_streambuf.c Mon May 03 14:06:43 2010 +0300
@@ -36,9 +36,7 @@
}
#endif
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>::~basic_streambuf()
-{}
+
template <class _CharT, class _Traits>
locale
@@ -49,88 +47,7 @@
return __tmp;
}
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::xsgetn(_CharT* __s, streamsize __n) {
- streamsize __result = 0;
- const int_type __eof = _Traits::eof();
- while (__result < __n) {
- if (_M_gnext < _M_gend) {
- size_t __chunk = (min) (__STATIC_CAST(size_t,_M_gend - _M_gnext),
- __STATIC_CAST(size_t,__n - __result));
- _Traits::copy(__s, _M_gnext, __chunk);
- __result += __chunk;
- __s += __chunk;
- _M_gnext += __chunk;
- }
- else {
- int_type __c = this->sbumpc();
- if (!_Traits::eq_int_type(__c, __eof)) {
- *__s = _Traits::to_char_type(__c);
- ++__result;
- ++__s;
- }
- else
- break;
- }
- }
-
- return __result;
-}
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::xsputn(const _CharT* __s, streamsize __n)
-{
- streamsize __result = 0;
- const int_type __eof = _Traits::eof();
-
- while (__result < __n) {
- if (_M_pnext < _M_pend) {
- size_t __chunk = (min) (__STATIC_CAST(size_t,_M_pend - _M_pnext),
- __STATIC_CAST(size_t,__n - __result));
- _Traits::copy(_M_pnext, __s, __chunk);
- __result += __chunk;
- __s += __chunk;
- _M_pnext += __chunk;
- }
-
- else if (!_Traits::eq_int_type(this->overflow(_Traits::to_int_type(*__s)),
- __eof)) {
- ++__result;
- ++__s;
- }
- else
- break;
- }
- return __result;
-}
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::_M_xsputnc(_CharT __c, streamsize __n)
-{
- streamsize __result = 0;
- const int_type __eof = _Traits::eof();
-
- while (__result < __n) {
- if (_M_pnext < _M_pend) {
- size_t __chunk = (min) (__STATIC_CAST(size_t,_M_pend - _M_pnext),
- __STATIC_CAST(size_t,__n - __result));
- _Traits::assign(_M_pnext, __chunk, __c);
- __result += __chunk;
- _M_pnext += __chunk;
- }
-
- else if (!_Traits::eq_int_type(this->overflow(_Traits::to_int_type(__c)),
- __eof))
- ++__result;
- else
- break;
- }
- return __result;
-}
template <class _CharT, class _Traits>
_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type
@@ -145,59 +62,7 @@
}
}
-template <class _CharT, class _Traits>
-_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::pbackfail(int_type) {
- return _Traits::eof();
-}
-template <class _CharT, class _Traits>
-_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::overflow(int_type) {
- return _Traits::eof();
-}
-
-template <class _CharT, class _Traits>
-_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::uflow() {
- return ( _Traits::eq_int_type(this->underflow(),_Traits::eof()) ?
- _Traits::eof() :
- _Traits::to_int_type(*_M_gnext++));
-}
-
-template <class _CharT, class _Traits>
-_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::int_type
-basic_streambuf<_CharT, _Traits>::underflow()
-{ return _Traits::eof(); }
-
-template <class _CharT, class _Traits>
-streamsize
-basic_streambuf<_CharT, _Traits>::showmanyc()
-{ return 0; }
-
-template <class _CharT, class _Traits>
-void
-basic_streambuf<_CharT, _Traits>::imbue(const locale&) {}
-
-template <class _CharT, class _Traits>
-int
-basic_streambuf<_CharT, _Traits>::sync() { return 0; }
-
-template <class _CharT, class _Traits>
-_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::seekpos(pos_type, ios_base::openmode)
-{ return pos_type(-1); }
-
-template <class _CharT, class _Traits>
-_STLP_TYPENAME_ON_RETURN_TYPE basic_streambuf<_CharT, _Traits>::pos_type
-basic_streambuf<_CharT, _Traits>::seekoff(off_type, ios_base::seekdir,
- ios_base::openmode)
-{ return pos_type(-1); }
-
-template <class _CharT, class _Traits>
-basic_streambuf<_CharT, _Traits>*
-basic_streambuf<_CharT, _Traits>:: setbuf(char_type*, streamsize)
-{ return this; }
_STLP_END_NAMESPACE
--- a/genericopenlibs/cppstdlib/stl/stlport/stl/_streambuf.h Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/stlport/stl/_streambuf.h Mon May 03 14:06:43 2010 +0300
@@ -72,7 +72,7 @@
// _STLP_mutex _M_lock;
public: // Destructor.
- virtual ~basic_streambuf();
+ virtual ~basic_streambuf(){}
protected: // The default constructor.
basic_streambuf()
@@ -122,24 +122,34 @@
_M_pend = __pend;
}
-protected: // Virtual buffer management functions.
-
- virtual basic_streambuf<_CharT, _Traits>* setbuf(char_type*, streamsize);
-
+protected: // Virtual buffer management functions.
+
+
+
+ virtual basic_streambuf<_CharT, _Traits>* setbuf(char_type*, streamsize) {
+ return this;
+ }
+
// Alters the stream position, using an integer offset. In this
// class seekoff does nothing; subclasses are expected to override it.
+
virtual pos_type seekoff(off_type, ios_base::seekdir,
- ios_base::openmode = ios_base::in | ios_base::out);
-
+ ios_base::openmode = ios_base::in | ios_base::out) {
+ return pos_type(-1);
+ }
+
// Alters the stream position, using a previously obtained streampos. In
// this class seekpos does nothing; subclasses are expected to override it.
virtual pos_type
- seekpos(pos_type, ios_base::openmode = ios_base::in | ios_base::out);
-
+ seekpos(pos_type, ios_base::openmode = ios_base::in | ios_base::out) {
+ return pos_type(-1);
+ }
+
// Synchronizes (i.e. flushes) the buffer. All subclasses are expected to
// override this virtual member function.
- virtual int sync();
-
+ virtual int sync() {
+ return 0;
+ }
public: // Buffer management.
basic_streambuf<_CharT, _Traits>* pubsetbuf(char_type* __s, streamsize __n)
@@ -155,46 +165,133 @@
int pubsync() { return this->sync(); }
-protected: // Virtual get area functions, as defined in
- // 17.5.2.4.3 and 17.5.2.4.4 of the standard.
+protected: // Virtual get area functions, as defined in
+ // 17.5.2.4.3 and 17.5.2.4.4 of the standard.
// Returns a lower bound on the number of characters that we can read,
// with underflow, before reaching end of file. (-1 is a special value:
// it means that underflow will fail.) Most subclasses should probably
// override this virtual member function.
- virtual streamsize showmanyc();
-
+
+ virtual streamsize showmanyc() {
+ return 0;
+ }
+
// Reads up to __n characters. Return value is the number of
// characters read.
- virtual streamsize xsgetn(char_type* __s, streamsize __n);
+ virtual streamsize xsgetn(char_type* __s, streamsize __n) {
+ streamsize __result = 0;
+ const int_type __eof = _Traits::eof();
+ while (__result < __n) {
+ if (_M_gnext < _M_gend) {
+ size_t __chunk = (min) (__STATIC_CAST(size_t,_M_gend - _M_gnext),
+ __STATIC_CAST(size_t,__n - __result));
+ _Traits::copy(__s, _M_gnext, __chunk);
+ __result += __chunk;
+ __s += __chunk;
+ _M_gnext += __chunk;
+ }
+ else {
+ int_type __c = this->sbumpc();
+ if (!_Traits::eq_int_type(__c, __eof)) {
+ *__s = _Traits::to_char_type(__c);
+ ++__result;
+ ++__s;
+ }
+ else
+ break;
+ }
+ }
+
+ return __result;
+ }
+
// Called when there is no read position, i.e. when gptr() is null
// or when gptr() >= egptr(). Subclasses are expected to override
// this virtual member function.
- virtual int_type underflow();
-
+ virtual int_type underflow() {
+ return _Traits::eof();
+ }
+
// Similar to underflow(), but used for unbuffered input. Most
// subclasses should probably override this virtual member function.
- virtual int_type uflow();
-
+ virtual int_type uflow() {
+ return ( _Traits::eq_int_type(this->underflow(),_Traits::eof()) ?
+ _Traits::eof() :
+ _Traits::to_int_type(*_M_gnext++));
+ }
+
// Called when there is no putback position, i.e. when gptr() is null
// or when gptr() == eback(). All subclasses are expected to override
// this virtual member function.
- virtual int_type pbackfail(int_type = traits_type::eof());
+ virtual int_type pbackfail(int_type = traits_type::eof()) {
+ return _Traits::eof();
+ }
+
+
+protected: // Virtual put area functions, as defined in
+ // 27.5.2.4.5 of the standard.
+
+ // Writes up to __n characters. Return value is the number of characters
+ // written.
-protected: // Virtual put area functions, as defined in
- // 27.5.2.4.5 of the standard.
+ virtual streamsize xsputn(const char_type* __s, streamsize __n) {
+ streamsize __result = 0;
+ const int_type __eof = _Traits::eof();
+
+ while (__result < __n) {
+ if (_M_pnext < _M_pend) {
+ size_t __chunk = (min) (__STATIC_CAST(size_t,_M_pend - _M_pnext),
+ __STATIC_CAST(size_t,__n - __result));
+ _Traits::copy(_M_pnext, __s, __chunk);
+ __result += __chunk;
+ __s += __chunk;
+ _M_pnext += __chunk;
+ }
- // Writes up to __n characters. Return value is the number of characters
- // written.
- virtual streamsize xsputn(const char_type* __s, streamsize __n);
-
- // Extension: writes up to __n copies of __c. Return value is the number
+ else if (!_Traits::eq_int_type(this->overflow(_Traits::to_int_type(*__s)),
+ __eof)) {
+ ++__result;
+ ++__s;
+ }
+ else
+ break;
+ }
+ return __result;
+ }
+
+ // Extension: writes up to __n copies of __c. Return value is the number
// of characters written.
- virtual streamsize _M_xsputnc(char_type __c, streamsize __n);
+
+ virtual streamsize _M_xsputnc(char_type __c, streamsize __n) {
+ streamsize __result = 0;
+ const int_type __eof = _Traits::eof();
+
+ while (__result < __n) {
+ if (_M_pnext < _M_pend) {
+ size_t __chunk = (min) (__STATIC_CAST(size_t,_M_pend - _M_pnext),
+ __STATIC_CAST(size_t,__n - __result));
+ _Traits::assign(_M_pnext, __chunk, __c);
+ __result += __chunk;
+ _M_pnext += __chunk;
+ }
- // Called when there is no write position. All subclasses are expected to
+ else if (!_Traits::eq_int_type(this->overflow(_Traits::to_int_type(__c)),
+ __eof))
+ ++__result;
+ else
+ break;
+ }
+ return __result;
+ }
+
+ // Called when there is no write position. All subclasses are expected to
// override this virtual member function.
- virtual int_type overflow(int_type = traits_type::eof());
+
+ virtual int_type overflow(int_type = traits_type::eof()) {
+ return _Traits::eof();
+ }
+
public: // Public members for writing characters.
// Write a single character.
@@ -259,7 +356,8 @@
// sets the streambuf's locale to __loc. Note that imbue should
// not (and cannot, since it has no access to streambuf's private
// members) set the streambuf's locale itself.
- virtual void imbue(const locale&);
+
+ virtual void imbue(const locale&) {}
public: // Locale-related functions.
locale pubimbue(const locale&);
--- a/genericopenlibs/cppstdlib/stl/test/eh/test_bit_vector.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/test/eh/test_bit_vector.cpp Mon May 03 14:06:43 2010 +0300
@@ -68,7 +68,7 @@
====================================================================================*/
void test_bit_vector()
{
-#define __WORD_BIT (int(CHAR_BIT*sizeof(unsigned int)))
+#define __WORD_BIT_LOCAL (int(CHAR_BIT*sizeof(unsigned int)))
// Make some bit vectors to work with.
BitVector emptyVector;
@@ -79,7 +79,7 @@
size_t BitVectorSize = random_number( random_base );
// Half the time, choose a size that will guarantee immediate reallocation
if ( random_number(2) )
- BitVectorSize = BitVectorSize / __WORD_BIT * __WORD_BIT;
+ BitVectorSize = BitVectorSize / __WORD_BIT_LOCAL * __WORD_BIT_LOCAL;
EH_ASSERT( testVector.size() == 0 );
testVector.reserve(BitVectorSize);
--- a/genericopenlibs/cppstdlib/stl/test/group/bld.inf Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/test/group/bld.inf Mon May 03 14:06:43 2010 +0300
@@ -21,6 +21,7 @@
prj_testmmpfiles
stlport_test
stlport_unit_test
+stlport_extraExports
PRJ_TESTEXPORTS
libstdcpp_tests.iby /epoc32/rom/include/libstdcpp_tests.iby
oe_autotest.iby /epoc32/rom/include/oe_autotest.iby
\ No newline at end of file
--- a/genericopenlibs/cppstdlib/stl/test/group/libstdcpp_tests.iby Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/stl/test/group/libstdcpp_tests.iby Mon May 03 14:06:43 2010 +0300
@@ -16,6 +16,7 @@
file=ABI_DIR\BUILD_DIR\stlport_test.exe sys\bin\stlport_test.exe
file=ABI_DIR\BUILD_DIR\stlport_unit_test.exe sys\bin\stlport_unit_test.exe
+file=ABI_DIR\BUILD_DIR\stlport_extraExports.dll sys\bin\stlport_extraExports.dll
file=ABI_DIR\BUILD_DIR\stdioserver.exe sys\bin\stdioserver.exe
file=ABI_DIR\BUILD_DIR\uncaught_exception_test.exe sys\bin\uncaught_exception_test.exe
file=ABI_DIR\BUILD_DIR\terminate_handler_test.exe sys\bin\terminate_handler_test.exe
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/cppstdlib/stl/test/group/stlport_extraExports.mmp Mon May 03 14:06:43 2010 +0300
@@ -0,0 +1,45 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Name : stlport_extraExports.mmp
+// Part of :
+
+
+TARGET stlport_extraExports.dll
+TARGETTYPE dll
+
+OPTION CW -wchar_t on
+MACRO _WCHAR_T_DECLARED
+
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
+OS_LAYER_LIBC_SYSTEMINCLUDE
+OS_LAYER_STLPORTV5_SYSTEMINCLUDE
+
+sourcepath ../unit/
+SOURCE extraExports.cpp
+
+EPOCALLOWDLLDATA
+
+nostrictdef
+
+STDCPP
+
+LIBRARY euser.lib
+LIBRARY libc.lib
+LIBRARY libstdcppv5.lib
+
+#ifdef ENABLE_ABIV2_MODE
+DEBUGGABLE_UDEBONLY
+#endif
+
+SMPSAFE
\ No newline at end of file
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/cppstdlib/stl/test/unit/extraExports.cpp Mon May 03 14:06:43 2010 +0300
@@ -0,0 +1,26 @@
+// Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+// All rights reserved.
+// This component and the accompanying materials are made available
+// under the terms of "Eclipse Public License v1.0"
+// which accompanies this distribution, and is available
+// at the URL "http://www.eclipse.org/legal/epl-v10.html".
+//
+// Initial Contributors:
+// Nokia Corporation - initial contribution.
+//
+// Contributors:
+//
+// Description:
+// Name : extraExports.cpp
+// Part of :
+
+// This test is to verify the behaviour of RVCT compiler on Key-functions (i.e., the first
+// non-pure, non-inlined virtual function of that class) in a templated function.
+// This test-dll is created just to verify, hence will not freeze this test-dll's exports.
+
+#include <sstream>
+
+EXPORT_C void test()
+{
+ std::stringstream test;
+}
--- a/genericopenlibs/cppstdlib/test/wchar_t_offsetof_tests/group/test_wchar_t.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/cppstdlib/test/wchar_t_offsetof_tests/group/test_wchar_t.mmp Mon May 03 14:06:43 2010 +0300
@@ -22,6 +22,7 @@
OS_LAYER_SYSTEMINCLUDE_SYMBIAN
OS_LAYER_LIBC_SYSTEMINCLUDE
+library libc.lib
SMPSAFE
--- a/genericopenlibs/liboil/group/liboil.iby Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/liboil/group/liboil.iby Mon May 03 14:06:43 2010 +0300
@@ -1,4 +1,4 @@
-// Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies).
+// Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
--- a/genericopenlibs/openenvcore/backend/group/StdioServer.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/group/StdioServer.mmp Mon May 03 14:06:43 2010 +0300
@@ -26,6 +26,7 @@
TARGETTYPE exe
UID 0x1000008D 0x10283075
+VERSION 10.1
SOURCEPATH ../src/StdioRedir/Server
--- a/genericopenlibs/openenvcore/backend/group/backend.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/group/backend.mmp Mon May 03 14:06:43 2010 +0300
@@ -26,7 +26,7 @@
LANG SC
CAPABILITY ALL -TCB
VENDORID 0x70000001
-VERSION 1.0
+VERSION 1.1
// Macro defs
#include "../../libc/group/libcflags.mmpi"
#ifdef GCCXML
--- a/genericopenlibs/openenvcore/backend/group/signalserver.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/group/signalserver.mmp Mon May 03 14:06:43 2010 +0300
@@ -25,6 +25,7 @@
TARGETTYPE exe
UID 0x1000008D 0x2001F3C8
+VERSION 10.1
SOURCEPATH ../src/signalserver/server
--- a/genericopenlibs/openenvcore/backend/ipcserver/ipcsrv/group/ipcserver.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/ipcserver/ipcsrv/group/ipcserver.mmp Mon May 03 14:06:43 2010 +0300
@@ -32,7 +32,7 @@
// Default vendor id
VENDORID 0x101FB657
-VERSION 1.0
+VERSION 1.1
SOURCEPATH ../src
--- a/genericopenlibs/openenvcore/backend/src/corebackend/fdesc.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/fdesc.cpp Mon May 03 14:06:43 2010 +0300
@@ -117,23 +117,27 @@
else //It's a special file, directory or normal file
{
RFs& rfs = Backend()->FileSession();
- TSpecialFileType fileType = _SystemSpecialFileBasedFilePath(name, err, rfs);
- if(fileType == EFileTypeMkFifo) //special file, FIFO
- {
- ret = CFileTable::FifoOpen(name, mode, perms, err);
- }
- else if(fileType == EFileTypeSymLink) //special file, symlink
- {
- ret = CFileTable::LinkOpen(name, mode, perms, err, rfs);
- }
+ TUint attribval;
+ TFullName fullName;
+ err = GetFullFile(fullName, (const TText16*)name, rfs);
+ if(err != KErrNone)
+ return NULL;
+ int ret1 = rfs.Att(fullName, attribval);
+ if (ret1 == 0 && ((attribval & (KEntryAttHidden | KEntryAttSystem))== (KEntryAttHidden | KEntryAttSystem)))
+ {
+ TSpecialFileType fileType = _SystemSpecialFileBasedFilePath(name, err, rfs);
+ if(fileType == EFileTypeMkFifo) //special file, FIFO
+ {
+ ret = CFileTable::FifoOpen(name, mode, perms, err);
+ }
+ else if(fileType == EFileTypeSymLink) //special file, symlink
+ {
+ ret = CFileTable::LinkOpen(name, mode, perms, err, rfs);
+ }
+ }
else //normal file or directory
{
- TFullName fullName;
- err = GetFullFile(fullName, (const TText16*)name, rfs);
- if(err != KErrNone)
- return NULL;
-
- //Try opening as a file
+ //Try opening as a file
CFileDesc* file = new CFileDesc;
if(file != NULL)
{
@@ -634,14 +638,14 @@
int mapped=MapMode(mode, fMode);
// if the file is in \sys, use EFileShareReadersOnly not EFileShareReadersOrWriters
TParsePtrC pars(aName);
- if (pars.Path().FindC(_L("\\SYS\\")) == 0)
+ if (pars.Path().FindF(_L("\\SYS\\")) == 0)
{
fMode &= ~EFileShareReadersOrWriters;
fMode |= EFileShareReadersOnly;
}
// if the file is in \resource, dont use EFileShareReadersOrWriters
- if (pars.Path().FindC(_L("\\resource\\")) == 0)
+ if (pars.Path().FindF(_L("\\resource\\")) == 0)
{
fMode &= ~EFileShareReadersOrWriters;
fMode |= EFileShareReadersOnly;
--- a/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/backend/src/corebackend/localif.cpp Mon May 03 14:06:43 2010 +0300
@@ -220,6 +220,8 @@
RHeap* oldHeap = User::SwitchHeap(iPrivateHeap);
// Close the array that maintains aselect request details
iASelectRequest.Close();
+ //close the RTz server
+ iTzServer.Close();
// Switch back to old heap
User::SwitchHeap(oldHeap);
--- a/genericopenlibs/openenvcore/ewsd/group/ewsd.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/ewsd/group/ewsd.mmp Mon May 03 14:06:43 2010 +0300
@@ -33,6 +33,7 @@
LANG SC
CAPABILITY ALL -TCB
VENDORID 0x70000001
+VERSION 10.1
#ifdef WINSCW
OPTION CW -stdinc
--- a/genericopenlibs/openenvcore/group/bld.inf Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/group/bld.inf Mon May 03 14:06:43 2010 +0300
@@ -39,6 +39,7 @@
PRJ_EXPORTS
openenv.iby /epoc32/rom/include/openenv.iby
openc_stdlibs_stub.sis /epoc32/data/z/system/install/openc_stdlibs_stub.sis
+openc_signalserver_stub.sis /epoc32/data/z/system/install/openc_signalserver_stub.sis
../include/pipsversion.h SYMBIAN_OS_LAYER_PUBLIC_EXPORT_PATH(stdapis/pipsversion.h)
// End of File
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/genericopenlibs/openenvcore/group/openc_signalserver_stub.pkg Mon May 03 14:06:43 2010 +0300
@@ -0,0 +1,25 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: package file for standard libraries
+;
+;
+&EN
+
+#{"Signal Server"}, (0x2002372A), 1, 7, 4
+%{"Nokia"}
+:"Nokia"
+
+[0x1028315F],0, 0, 0 ,{"S60Product5thEdition "}
+
+""-"z:\sys\bin\signalserver.exe", FF
Binary file genericopenlibs/openenvcore/group/openc_signalserver_stub.sis has changed
Binary file genericopenlibs/openenvcore/group/openc_stdlibs_stub.pkg has changed
Binary file genericopenlibs/openenvcore/group/openc_stdlibs_stub.sis has changed
--- a/genericopenlibs/openenvcore/group/openenv.iby Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/group/openenv.iby Mon May 03 14:06:43 2010 +0300
@@ -33,6 +33,8 @@
data = EPOCROOT##epoc32\winscw\c\resource\pips\locales.txt \resource\pips\locales.txt
data = EPOCROOT##epoc32\winscw\c\resource\pips\services \resource\pips\services
data = EPOCROOT##epoc32\data\z\system\install\openc_stdlibs_stub.sis \system\install\openc_stdlibs_stub.sis
+data = EPOCROOT##epoc32\data\z\system\install\openc_signalserver_stub.sis \system\install\openc_signalserver_stub.sis
+
#include <stdcpp.iby> /* StdC++ library*/
#ifdef SYMBIAN_OE_POSIX_SIGNALS
--- a/genericopenlibs/openenvcore/include/pipsversion.h Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/include/pipsversion.h Mon May 03 14:06:43 2010 +0300
@@ -23,10 +23,10 @@
#ifndef _PIPSVERSION_H
#define _PIPSVERSION_H
-#define PIPS_VERSION 170
+#define PIPS_VERSION 174
#define PIPS_MAJOR_VERSION 1
#define PIPS_MINOR_VERSION 7
-#define PIPS_BUILD_VERSION 0
+#define PIPS_BUILD_VERSION 4
#endif //_PIPSVERSION_H
--- a/genericopenlibs/openenvcore/libc/group/libc.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/group/libc.mmp Mon May 03 14:06:43 2010 +0300
@@ -41,7 +41,7 @@
#ifdef ARMCC_3_1
OPTION ARMCC --diag_remark 3017
#endif
-VERSION 1.0
+VERSION 1.1
#ifndef WINSCW
EPOCALLOWDLLDATA
--- a/genericopenlibs/openenvcore/libc/src/localeinfo.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/src/localeinfo.cpp Mon May 03 14:06:43 2010 +0300
@@ -1676,7 +1676,7 @@
locale.GetLocaleDllName(aspect,Kdname);
#ifdef SYMBIAN_DISTINCT_LOCALE_MODEL
// check if the new dlls is present then load it or go for old dll
- if( Kdname.Find(_L("elocl.")) == KErrNotFound )
+ if( Kdname.FindC(_L("elocl.")) == KErrNotFound )
{
iOldDllPresent = 0;
locale.GetLocaleDllName(ELocaleTimeDateSettings,reg_dllname);
--- a/genericopenlibs/openenvcore/libc/test/teststdlib/inc/tstdlib.h Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/test/teststdlib/inc/tstdlib.h Mon May 03 14:06:43 2010 +0300
@@ -286,6 +286,7 @@
_LIT(Kstrtoumaxbasic2, "strtoumaxbasic2");
_LIT(Kconfstr_Test2, "confstr_Test2");
_LIT(Ktmpfile_fseek, "tmpfile_fseek");
+_LIT(KtestSymLink, "testSymLink");
class CTestStdlib : public CTestStep
{
@@ -530,6 +531,8 @@
TInt strtoumaxbasic2();
TInt confstr_Test2( );
TInt tmpfile_fseek();
+ TInt testSymLink();
+
public:
TInt iParamCnt;
};
--- a/genericopenlibs/openenvcore/libc/test/teststdlib/scripts/tstdlib.script Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/test/teststdlib/scripts/tstdlib.script Mon May 03 14:06:43 2010 +0300
@@ -1484,3 +1484,9 @@
//! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSTDLIB-0248
RUN_TEST_STEP !Result=0 10 tstdlib confstr_Test2
END_TESTCASE OPENENV-LIBC-CIT-TESTSTDLIB-0248
+
+START_TESTCASE OPENENV-LIBC-CIT-TESTSTDLIB-0249
+//! @SYMTestCaseID OPENENV-LIBC-CIT-TESTSTDLIB-0249
+RUN_TEST_STEP !Result=0 10 tstdlib testSymLink
+END_TESTCASE OPENENV-LIBC-CIT-TESTSTDLIB-0249
+
--- a/genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlib.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlib.cpp Mon May 03 14:06:43 2010 +0300
@@ -1316,6 +1316,13 @@
err = tmpfile_fseek();
SetTestStepResult(err ? static_cast<TVerdict>(err) : EPass);
}
+
+ else if(TestStepName() == KtestSymLink)
+ {
+ INFO_PRINTF1(_L("testSymLink():"));
+ err = testSymLink();
+ SetTestStepResult(err ? static_cast<TVerdict>(err) : EPass);
+ }
return TestStepResult();
}
--- a/genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlibblocks.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlibblocks.cpp Mon May 03 14:06:43 2010 +0300
@@ -8986,3 +8986,35 @@
}
return ret;
}
+TInt CTestStdlib::testSymLink()
+ {
+ int ret = KErrNone;
+ const char* file = "C:\\file.dat";
+ const char* hlnk = "c:\\hard.lnk";
+ const char* hlnk2 = "c:\\\\hard.lnk";
+
+ const char* data = "1234567890";
+ const char* data1 = "abcdefghij";
+ const char* data2 = "ABCDEFGHIJ";
+ FILE* fp = fopen(file, "w");
+ fwrite(data, 1, 10, fp);
+ fclose(fp);
+
+ ret = link(file, hlnk);
+ if (ret)
+ {
+ printf("create hard link fail :%d\n", ret);
+ return ret;
+ }
+
+ fp = fopen(hlnk, "r+");
+ if( fp )
+ fwrite(data1, 1, 10, fp);
+ fclose(fp);
+
+ fp = fopen(hlnk2, "r+");
+ if( fp )
+ fwrite(data2, 1, 10, fp);
+ fclose(fp);
+ return ret;
+ }
--- a/genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlibserver.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libc/test/teststdlib/src/tstdlibserver.cpp Mon May 03 14:06:43 2010 +0300
@@ -868,6 +868,10 @@
{
testStep = new CTestStdlib(aStepName);
}
+ if(aStepName == KtestSymLink)
+ {
+ testStep = new CTestStdlib(aStepName);
+ }
return testStep;
}
--- a/genericopenlibs/openenvcore/libdl/group/libdl.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libdl/group/libdl.mmp Mon May 03 14:06:43 2010 +0300
@@ -24,7 +24,7 @@
CAPABILITY ALL -TCB
VENDORID 0x70000001
-VERSION 1.0
+VERSION 1.1
#ifndef WINSCW
EPOCALLOWDLLDATA
--- a/genericopenlibs/openenvcore/liblogger/group/liblogger.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/liblogger/group/liblogger.mmp Mon May 03 14:06:43 2010 +0300
@@ -22,7 +22,7 @@
CAPABILITY ALL -TCB
VENDORID 0x70000001
-VERSION 1.0
+VERSION 1.1
//MACRO SYMBIAN_FILE_LOGGER
--- a/genericopenlibs/openenvcore/libm/group/libm.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libm/group/libm.mmp Mon May 03 14:06:43 2010 +0300
@@ -27,7 +27,7 @@
LANG SC
CAPABILITY All -Tcb
VENDORID 0x70000001
-VERSION 1.0
+VERSION 1.1
OPTION ARMCC --diag_remark 3017
// include all mmpi files
--- a/genericopenlibs/openenvcore/libpthread/group/libpthread.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericopenlibs/openenvcore/libpthread/group/libpthread.mmp Mon May 03 14:06:43 2010 +0300
@@ -27,7 +27,7 @@
CAPABILITY All -Tcb
VENDORID 0x70000001
-VERSION 1.0
+VERSION 1.1
#ifndef WINSCW
EPOCALLOWDLLDATA
--- a/genericservices/systemagent/src/halsettings/halfiles.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/genericservices/systemagent/src/halsettings/halfiles.cpp Mon May 03 14:06:43 2010 +0300
@@ -186,6 +186,8 @@
RHandleBase handle;
handle.SetHandle(pS->iValue);
handle.Close();
+ // We will not persisit the closed handle
+ continue;
}
}
--- a/glib/build/symbian/glib/group/libglib.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/glib/build/symbian/glib/group/libglib.mmp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
targettype dll
UID 0x1000008d 0x10281F2C
VENDORID 0x101FB657
-VERSION 2.204
+VERSION 2.205
//List of macros
//macro G_LOG_DOMAIN="GLib"
macro MOBILE_PORT
--- a/glib/build/symbian/glibbackend/group/glibbackend.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/glib/build/symbian/glibbackend/group/glibbackend.mmp Mon May 03 14:06:43 2010 +0300
@@ -28,7 +28,7 @@
VENDORID 0x101FB657
#endif
-VERSION 1.0
+VERSION 1.1
#ifndef WINSCW
EPOCALLOWDLLDATA
--- a/glib/build/symbian/gmodule/group/libgmodule.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/glib/build/symbian/gmodule/group/libgmodule.mmp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
targettype dll
UID 0x1000008d 0x10281F3B
VENDORID 0x101FB657
-VERSION 2.204
+VERSION 2.205
//List of macros
//macro G_LOG_DOMAIN="GModule"
//macro G_DISABLE_DEPRECATED
--- a/glib/build/symbian/gobject/group/libgobject.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/glib/build/symbian/gobject/group/libgobject.mmp Mon May 03 14:06:43 2010 +0300
@@ -23,7 +23,7 @@
targettype dll
UID 0x1000008d 0x10281F39
VENDORID 0x101FB657
-VERSION 2.204
+VERSION 2.205
//Macros list
macro MOBILE_PORT
macro HAVE_CONFIG_H
--- a/glib/build/symbian/gthread/group/libgthread.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/glib/build/symbian/gthread/group/libgthread.mmp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
targettype dll
UID 0x1000008d 0x10281F3A
VENDORID 0x101FB657
-VERSION 2.204
+VERSION 2.205
//List of macros
//macro G_LOG_DOMAIN="GThread"
//macro G_DISABLE_DEPRECATED
--- a/group/bld.inf Fri Apr 16 16:46:38 2010 +0300
+++ b/group/bld.inf Mon May 03 14:06:43 2010 +0300
@@ -63,5 +63,9 @@
// exporting openc_liblogger stub sis
../stdlibs/install/openc_liblogger_stub.sis /epoc32/data/z/system/install/openc_liblogger_stub.sis
+// exporting openc_signalserver_stub sis
+../stdlibs/install/openc_signalserver_stub.sis /epoc32/data/z/system/install/openc_signalserver_stub.sis
+
+
// End of File
--- a/lowlevellibsandfws/apputils/bsul/test/t_cacheddriveinfo/t_cacheddriveinfo.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/bsul/test/t_cacheddriveinfo/t_cacheddriveinfo.mmp Mon May 03 14:06:43 2010 +0300
@@ -23,7 +23,7 @@
CAPABILITY All -Tcb
TARGETTYPE EXE
-SYSTEMINCLUDE /epoc32/include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SOURCEPATH .
SOURCE t_cacheddriveinfo.cpp
--- a/lowlevellibsandfws/apputils/bsul/test/t_clientmessage/t_clientmessage.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/bsul/test/t_clientmessage/t_clientmessage.mmp Mon May 03 14:06:43 2010 +0300
@@ -18,7 +18,7 @@
CAPABILITY ReadUserData WriteUserData
SECUREID 0x10285B57
-systeminclude /epoc32/include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SOURCEPATH .
source t_clientmessage.cpp
--- a/lowlevellibsandfws/apputils/bsul/test/t_clientmessage/t_clientmessagetestserver.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/bsul/test/t_clientmessage/t_clientmessagetestserver.mmp Mon May 03 14:06:43 2010 +0300
@@ -16,7 +16,7 @@
target t_clientmessagetestserver.exe
targettype exe
-systeminclude /epoc32/include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SOURCEPATH .
source t_clientmessagetestserver.cpp
--- a/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser16.MMP Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser16.MMP Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
VENDORID 0x70000001
SOURCEPATH ../t_iniparser
-systeminclude /epoc32/include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
source T_IniParser16.CPP
--- a/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser8.MMP Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParser8.MMP Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
VENDORID 0x70000001
SOURCEPATH ../t_iniparser
-systeminclude /epoc32/include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
source T_IniParser8.CPP
--- a/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserPerformance.MMP Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserPerformance.MMP Mon May 03 14:06:43 2010 +0300
@@ -22,7 +22,7 @@
VENDORID 0x70000001
SOURCEPATH ../t_iniparser
-systeminclude /epoc32/include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
userinclude ../t_iniparser
source T_IniParserPerformance.CPP
--- a/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserUnit.MMP Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/bsul/test/t_iniparser/T_IniParserUnit.MMP Mon May 03 14:06:43 2010 +0300
@@ -18,7 +18,7 @@
UID 0x10000077
VENDORID 0x70000001
-systeminclude /epoc32/include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
USERINCLUDE ../../src ../../inc
SOURCEPATH ../t_iniparser
--- a/lowlevellibsandfws/apputils/engineering/stringpool/example/StringTableExample.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/engineering/stringpool/example/StringTableExample.mmp Mon May 03 14:06:43 2010 +0300
@@ -16,7 +16,7 @@
TARGET StringTableExample.exe
TARGETTYPE exe
-SYSTEMINCLUDE /epoc32/include
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
SOURCEPATH .
SOURCE StringTableExample.cpp
--- a/lowlevellibsandfws/apputils/multipartparser/test/tef/group/mppsmoketestlib.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/multipartparser/test/tef/group/mppsmoketestlib.mmp Mon May 03 14:06:43 2010 +0300
@@ -23,9 +23,7 @@
SOURCE mppsmoketestlib.cpp
USERINCLUDE ../smoketest/src
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-SYSTEMINCLUDE /epoc32/include/bafl
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
nostrictdef
--- a/lowlevellibsandfws/apputils/multipartparser/test/tef/group/mppsmoketesttefsuite.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/apputils/multipartparser/test/tef/group/mppsmoketesttefsuite.mmp Mon May 03 14:06:43 2010 +0300
@@ -23,9 +23,7 @@
SOURCE mppsmoketesttefserver.cpp
SOURCE mppsmoketeststeps.cpp
-SYSTEMINCLUDE /epoc32/include
-SYSTEMINCLUDE /epoc32/include/test
-SYSTEMINCLUDE /epoc32/include/bafl
+OS_LAYER_SYSTEMINCLUDE_SYMBIAN
LIBRARY euser.lib
--- a/lowlevellibsandfws/genericusabilitylib/documentation/dox/mainpage.dox Fri Apr 16 16:46:38 2010 +0300
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,885 +0,0 @@
-/**
-@mainpage
-
-@par Overview
-
-@par
-
-This document describes new core APIs for semi-automatic resource
-management designed to begin to increase the baseline usability of
-Symbian OS for developers. We would welcome feedback, improvement
-suggestions, and defect reports. Note that there is a Q&A section at
-the bottom of this page that explains some of the background rationale
-behind the design choices we have made to get to this point.
-
-Please send any questions or review feedback you have to: core.idioms@symbian.com
-
-The new APIs include the following:
-
-- A new type category: the L-class
- - Allows leaving constructors and can rely on automatic destructor execution for
- cleanup (explained in more detail below)
-- New general purpose, self-managing string classes that can be used much
- like T-classes
- - LString16
- - For manipulating strings of 16 bit characters
- - Usually used via the ::LString typedef
- - LString8
- - For manipulating strings of 8 bit characters
- - ::LData
- - Type alias for LString8 allowing the intent to use it as a raw (non-character) data buffer to be expressed
- - The LString classes are based on the descriptor APIs and are fully interoperable with descriptors
- - The LString classes can grow on demand and do not always need to be
- initialized with a fixed reserve maximum length
-- New "smart pointer" style utility classes for managing resources referenced from local variables,
- which may be used instead of the existing cleanup stack API
- - LCleanedupPtr
- - Alternative to PushL(CBase*)/Pop()/PopAndDestroy() code sequences
- - LCleanedupHandle
- - Alternative to CleanupClosePushL()/Pop()/PopAndDestroy() code sequences
- - See also the more rarely used LCleanedupRef, LCleanedupArray, and LCleanedupGuard
-- New "smart pointer" style utility classes for managing resources referenced from data members,
- which reduce the need for manually-written destructors
- - LManagedPtr
- - Alternative to calling delete manually in a destructor for the managed data member
- - LManagedHandle
- - Alternative to calling Close() manually in a destructor for the managed data member
- - See also the more rarely used LManagedRef, LManagedArray, and LManagedGuard
-- Enablers for the (optional, typically private) use of single-phase construction
- - #CONSTRUCTORS_MAY_LEAVE
- - A class declaration flagging that the class's constructors may leave
- - Normally used in combination with the LManagedXxx classes to ensure reliable cleanup in case of a constructor leaving
- - Normally hidden behind a conventional Symbian NewL() abstraction
-- New utilities for making correct, error checking code easier to read
- - New #OR_LEAVE postfix macro
- - Alternative to wrapping User::LeaveIfError() around an expression
-
-The motivation for the new APIs is to make it easier to write correct,
-less brittle code in the first instance, but perhaps more so to make
-the resulting code easier to read and easier to modify safely later.
-
-Some guiding principles:
-
-- Resource management should be handled either fully automatically or declaratively
- at point of definition as far as possible
- - Helps to eliminate mismatches between code that pushes and code that pops
- - Helps to eliminate mismatches between code that constructs and code that destructs
- - Removes the need to duplicate cleanup code (or modify your code's structure) to correctly handle functions with multiple return points
- - Makes changing code safer and easier by reducing dependencies between different areas of the code
-- It should be easier and lighter weight to write and maintain leave-safe code
- - So that more people are prepared to make the investment to do it right
-- The primary function of code should not be swamped by auxiliary error checking and resource management
- - The key logic should be front and centre, and read as straightforwardly as possible
-- It should be easier to write fully general code
- - Unsafe and/or overly conservative maximum size limitations should not be
- encouraged by making that style of code easier to write
-- Terminology should be as conventional as possible
- - We call a string a string
-
-To help illustrate the new APIs, here is a sampling of idiomatic code
-implemented first in terms of the current Symbian APIs, and alongside
-in terms of the new APIs.
-
-<table width="100%">
-
-<tr valign="top">
-<td>Current APIs</td><td>New APIs</td>
-</tr>
-
-<tr valign="top">
-<td>
-@code
-{
-TBuf<KMaxQuery> query; // fixed worst-case max
-query.Format(KQueryFormat, param);
-ExecuteQueryL(query);
-}
-@endcode
-</td>
-<td>
-@code
-{
-LString query; // can grow its heap buffer on demand
-query.FormatL(KQueryFormat, param);
-ExecuteQueryL(query);
-} // query buffer released on normal scope exit or leave
-@endcode
-</td>
-</tr>
-
-<tr valign="top">
-<td>
-@code
-{
-HBufC* queryc = HBufC::NewLC(KTooBigForStackMaxQuery);
-TPtr query(queryc->Des());
-BuildQueryL(query);
-ExecuteQueryL(query);
-CleanupStack::PopAndDestroy();
-}
-@endcode
-</td>
-<td>
-@code
-{
-LString query;
-BuildQueryL(query);
-ExecuteQueryL(query);
-}
-@endcode
-</td>
-</tr>
-
-<tr valign="top">
-<td>
-@code
-{
-RBuf query;
-query.CleanupClosePushL();
-query.CreateL(TooBigForStackMaxQuery);
-BuildQueryL(query);
-ExecuteQueryL(query);
-CleanupStack::PopAndDestroy();
-}
-@endcode
-</td>
-<td>
-@code
-{
-LString query;
-BuildQueryL(query);
-ExecuteQueryL(query);
-}
-@endcode
-</td>
-</tr>
-
-<tr valign="top">
-<td>
-
-@code
-{
-CQuery* query = CQuery::NewL();
-CleanupStack::PushL(query);
-query->BuildQueryL();
-query->ExecuteQueryL();
-CleanupStack::PopAndDestroy();
-}
-@endcode
-
-</td>
-<td>
-
-@code
-{
-LCleanedupPtr<CQuery> query(CQuery::NewL());
-query->BuildQueryL();
-query->ExecuteQueryL();
-} // query deleted on normal scope exit or leave
-@endcode
-
-</td>
-</tr>
-
-<tr valign="top">
-<td>
-
-@code
-{
-CQuery* query = CQuery::NewL();
-CleanupStack::PushL(query);
-query->BuildQueryL();
-CleanupStack::Pop();
-return query;
-}
-@endcode
-
-</td>
-<td>
-
-@code
-{
-LCleanedupPtr<CQuery> query(CQuery::NewL());
-query->BuildQueryL();
-return query.Unmanage();
-// query was protected until Unmanage() was called
-}
-@endcode
-
-</td>
-</tr>
-
-<tr valign="top">
-<td>
-
-@code
-{
-RQuery query;
-CleanupClosePushL(query);
-query.BuildQueryL();
-query.ExecuteQueryL();
-CleanupStack::PopAndDestroy();
-}
-@endcode
-
-</td>
-<td>
-
-@code
-{
-LCleanedupHandle<RQuery> query;
-query->BuildQueryL();
-query->ExecuteQueryL();
-} // query is closed on normal scope exit or leave
-@endcode
-
-</td>
-</tr>
-
-</table>
-
-@par Concepts
-
-These APIs introduce a new category of Symbian type: the
-L-class. L-classes have characteristics close to standard C++ value
-and handle classes, including the following:
-
-- Constructors, operators, and implicit operations may leave
-- They are self-managing and do not require auxiliary memory management logic
-
-L-classes may be used like T-classes except that they can own
-resources, they typically rely on guaranteed execution of their
-destructors, and they cannot necessarily be naively bitwise
-copied. Any code that manipulates L-class instances must be
-leave-safe. The only exception to this rule is if the particular
-operations being used are explicitly documented not to leave (e.g. the
-default LString constructor and all the LManagedXXX constructors).
-
-The L prefix denotes that these classes may be Liberal when it comes
-to Leaving, while being Leave-safe themselves.
-
-The implementation of many L classes relies on the leave=throw mapping
-current in Symbian OS since v9.1 because this guarantees destructor
-execution for objects allocated on the stack.
-
-@par Notes on Usage
-
-For ease of experimentation during review, all the new APIs are
-packaged for use as a statically-linked bundle:
-
-- #include <euserhl.h> in your code
-- STATICLIBRARY euserhl.lib in your mmp
-
-Some important dos and don'ts (most of which leavescan will reliably flag):
-
-- The LCleanedupXXX classes are for managing locals only, and may not be used to manage data members. This is because the LCleanedupXXX classes are implemented in terms of the legacy cleanup stack.
-- The LCleanedupXXX classes must not be used in the same function as the legacy cleanup stack APIs. They can interact unintuitively and this is best avoided. It is all or nothing at function granularity.
-- Use L-suffix method variants with LCleanedupXXX, never LC-suffix variants that manipulate the cleanup stack. This is for the same reason as the previous point.
-- The LManagedXXX classes should only be used for data members. If they are used for locals, they can interact unintuitively with cleanup stack based cleanup (from other functions on the call stack) with respect to cleanup ordering.
-- Whenever you write code that manipulates LString or other L-prefix classes, always conservatively leave-safe your code. This is now easier with the LCleanedupXXX utilities.
-
-On the resource management utility classes:
-
-- A managed object's member functions may be called directly on the managing container, but -> notation must be used to access them
-- Implicit coercions from managing containers to managed types are not defined; instead the dereference operator * must be used e.g. to obtain a reference suitable for passing as a parameter to another function
-- Pop()-like semantics (as opposed to PopAndDestroy()) is achieved by calling Unmanage() on the managing container before it goes out of scope; Unmanage() returns the managed object which can then be returned from your function, or passed to a different function which takes over ownership. Unlike Pop(), however, Unmanage() simply sets a flag to disable cleanup and may be called at any time without worrying about stack discipline
-- It is still typically necessary to declare, define, and export a destructor, even if its implementation (currently) contains no hand-written code
- - The destructor must be available wherever delete may be called on an instance of the class
- - The compiler will automatically generate destruction logic behind the scenes for LString and LManagedXxx data members, even if you don't write any code yourself
- - The destructor may of course change over time anyway
-
-On the LString classes:
-
-- Existing library functions that accept a modifiable TDes cannot take advantage of LString's on-demand growth behaviour; the necessary capacity must first be explicitly reserved in the LString before calling such functions (this can be done either with a constructor parameter or by calling SetMaxLengthL())
-- Any descriptor method that could panic due to lack of capacity is replaced with a leaving variant that grows the heap e.g. instead of Append(), LString defines AppendL(). The non-leaving TDes versions are hidden to avoid accidental use, although they can still be accessed via a TDes typed (as opposed to LString typed) ref or pointer
-- Programmers new to Symbian OS could first be introduced to descriptors and string handling via just const TDesC& (for input parameter contracts), TDes (for output parameter contracts), and LString for implementation. LStrings can be initialized by value from any descriptor return type, and by automatically taking ownership in the HBufC* return case.
-
-On single-phase construction:
-
-- This option is enabled by LString and the LManagedXxx classes
- - However you implement construction behind the scenes, NewL is an important abstraction
- - Think hard before using single-phase construction in a framework class designed for derivation in client code
-- LString and the LManagedXxx classes may be used safely in conventional Symbian two-phase construction as well as standard C++ style single-phase construction
- - LManagedXxx construction never leaves, and is safe to perform at any stage
- - Default construction of an empty LString never leaves, but other initializations must be deferred to ConstructL
-- An understanding of standard C++ construction semantics is required before attempting to use single-phase construction
- - If a constructor throws mid-way through, its matching destructor is not invoked to clean up
- - Instead all data members fully-constructed to the point of the leave are automatically destructed
- - Therefore, in effect, all class cleanup must typically be achieved via data member destruction
- - The presence of a non-empty destructor is a warning sign if you are using single-phase construction
-
-An annotated example using the new APIs follows (the
-euserhl_walkthrough example goes into much more detail than we do
-here).
-
-@code
-#include <e32std.h>
-#include <f32file.h>
-#include <euserhl.h> // Includes all the new APIs
-
-class CFinder : public CBase
- {
-public:
- // We have opted to use single-phase construction here, and some of
- // our constructor's initialization actions may leave. In order to
- // guarantee full cleanup in all cases, we have to declare this fact.
- CONSTRUCTORS_MAY_LEAVE
- static CFinder* NewL(const TDesC& aPattern);
- ~CFinder();
- void GetNextMatchL(TDes& aMatch);
-
-protected:
- CFinder(const TDesC& aPattern);
-
-protected:
- LString iPattern;
- LManagedHandle<RFs> iFs; // We always use LManagedXxx for data members
- // ...
- };
-
-CFinder* CFinder::NewL(const TDesC& aPattern)
- {
- return new(ELeave) CFinder(aPattern);
- }
-
-CFinder::CFinder(const TDesC& aPattern)
- // This initializer may leave, since the LString will allocate a
- // heap buffer large enough to contain a copy of aPattern's data
- : iPattern(aPattern)
- {
- // If connection fails and we leave here, iPattern's destructor
- // will be called automatically, and the string's resources will
- // be released
- iFs->Connect() OR_LEAVE;
- }
-
-CFinder::~CFinder()
- {
- // Automatic destruction of each of the data members does all of the
- // work for us: iPattern's heap buffer if freed, while Close() is
- // called on the managed RFs in iFs.
-
- // Even though this destructor is textually empty, it should
- // still be exported; the compiler is generating destruction logic
- // for us in this case
- }
-
-void CFinder::GetNextMatchL(TDes& aMatch)
- {
- // ...
- LString possible;
- // ...
- LCleanedupHandle<RFile> file; // We always use CleanedupXXX for locals
- TInt status = file->Open(*iFs, possible, EFileRead); // Note use of -> and * here
- // ...
- aMatch = possible;
- // ...
- }
-@endcode
-
-For comparison, the original code in terms of existing APIs:
-
-@code
-#include <e32std.h>
-#include <f32file.h>
-
-class CFinder : public CBase
- {
-public:
- static CFinder* NewL(const TDesC& aPattern);
- ~CFinder();
- void GetNextMatchL(TDes& aMatch);
-
-protected:
- CFinder();
- void ConstructL(const TDesC& aPattern);
-
-protected:
- HBufC* iPattern;
- RFs iFs;
- // ...
- };
-
-CFinder* CFinder::NewL(const TDesC& aPattern)
- {
- CFinder* self = new(ELeave) CFinder;
- CleanupStack::PushL(self);
- self->ConstructL(aPattern);
- CleanupStack::Pop();
- return self;
- }
-
-CFinder::CFinder()
- {
- }
-
-void CFinder::ConstructL(const TDesC& aPattern)
- {
- iPattern = aPattern.AllocL();
- User::LeaveIfError(iFs.Connect());
- }
-
-CFinder::~CFinder()
- {
- iFs.Close();
- delete iPattern;
- }
-
-void CFinder::GetNextMatchL(TDes& aMatch)
- {
- // ...
- RFile file;
- CleanupClosePushL(file);
- TInt status = file.Open(iFs, possible, EFileRead);
- // ...
- aMatch = possible;
- // ...
- CleanupStack::PopAndDestroy();
- }
-@endcode
-
-@par Q&A
-
-\b General.1 <em>Why start at the bottom? Shouldn't improving the usability of Symbian
-OS and its APIs be a top-down initiative?</em>
-
-There is a product-wide usability initiative within Symbian which aims
-to address all of APIs, documentation, and tools. On the API side,
-there are tracks that try to improve the design process for good API
-usability going forward, and tracks like this one that try to improve
-the usability of existing functionality. This is just the first
-deliverable of the latter effort, but other work is ongoing.
-
-\b General.2 <em>Will Core Idioms changes like these be backed up by tools support?</em>
-
-Yes, support for tools like Leavescan and Coverity, as well as more
-basic debugger presentation support for the new descriptor types and
-resource management classes, is being planned into the roll-out
-project.
-
-\b General.3 <em>Will Core Idioms changes like these be backed up by matching
-documentation, examples, and coding standards updates?</em>
-
-Yes, we understand this to be essential and this is our goal.
-
-\b General.4 <em>Symbian will support STL as part of Open Environment, and
-Symbian's STL implementation includes std::string and
-std::auto_ptr. Why not just use them?</em>
-
-We investigated this option to the point of creating a native Symbian
-C++ interoperable STL subset for experimentation. This was ultimately
-rejected for the following reasons:
-
-- Hybrid-style code (with mixed Symbian-style and standard-style naming) is
- harder to read and to work with than code in a single consistent style
-- Beyond basic naming conventions, supporting two very different APIs
- for manipulating strings (the descriptor methods alongside the
- std::string methods) similarly does not help usability
-- Interoperability between std::string and TDesC/TDes accepting APIs
- implemented via implicit coercion is more limited than the direct placement
- of new string classes within the existing descriptor hierarchy can
- achieve
-- Because we need a number of Symbian-specific resource management
- utilities (cleanup-stack aware, R-class aware, and so on), auto_ptr
- on its own does not provide much leverage
-- It would require maintaining two subtly variant STL builds: the Open
- Environment version with standard C++ new and exception
- behaviour, and a Symbian C++ version with new(ELeave) and leaving
- behaviour
-
-Instead we opted to give Symbian C++ a "programming philosophy
-upgrade"; more aligned with standard C++ but still in the style of
-Symbian C++ and its existing APIs. The result is something that can be
-more easily and more incrementally adopted by existing Symbian C++
-projects and teams. Note that this decision to focus first on building
-out the usability of native Symbian C++ does not preclude the
-possibility of an official hybridized Symbian embedding of STL being
-developed at a later date
-
-Finally, we could have used Symbian-ized names like XAutoPtrYyy as the
-basis for the resource management utility classes. However, this was
-deliberately avoided because the semantics of our classes are
-different from auto_ptr e.g. they can't support copy construction or
-transfer of ownership through parameter passing and return, and
-different variants are required for use with locals than with data
-members. We did not want to give the Symbian classes names that could
-result in developers making natural but incorrect assumptions about
-their behaviour based experience with similarly-named classes
-elsewhere.
-
-\b General.5 <em>These new template classes seem more conceptually
-complex than what they're replacing. How can this improve
-usability?</em>
-
-Template classes can be complex to implement, but they're not
-particularly difficult to understand or use in the way they're
-employed here. Symbian programmers are already familiar with the
-basics from RArray<T> and RPointerArray<T>. And to anyone coming from
-standard C++ and STL it's second nature, as in fact is this general
-style of parameterised declaration to desktop Java and C# programmers
-used to generics.
-
-In the end, it's just a concise, declarative annotation that takes
-leaky code and helps turn it into robust code.
-
-Leaky:
-
-@code
-{
-CFoo* foo = CFoo::NewL();
-foo->ExecuteL(); // the CFoo leaks if this leaves
-if (foo->IsAsync())
- {
- // ...
- return; // the CFoo leaks if we return
- }
-// ...
-} // the CFoo leaks if we exit scope normally
-@endcode
-
-Safe (new style):
-
-@code
-{
-LCleanedupPtr<CFoo> foo(CFoo::NewL());
-foo->ExecuteL(); // the CFoo is automatically deleted if we leave
-if (foo->IsAsync())
- {
- // ...
- return; // the CFoo is automatically deleted if we return
- }
-// ...
-} // the CFoo is automatically deleted if we exit scope normally
-@endcode
-
-Safe (classic style):
-
-@code
-{
-CFoo* foo = CFoo::NewL();
-CleanupStack::PushL(foo);
-foo->ExecuteL(); // the CFoo is automatically deleted if we leave
-if (foo->IsAsync())
- {
- // ...
- CleanupStack::PopAndDestroy(foo); // the CFoo is deleted manually
- return;
- }
-// ...
-CleanupStack::PopAndDestroy(foo); // the CFoo is deleted manually
-}
-@endcode
-
-\b General.6 <em>Don't some of these APIs simply trade depth for width? There are less lines of code but the statements are longer and more complex</em>
-
-Placing as much information at point of declaration as possible guards
-against separate lines of code becoming inconsistent with one-another,
-particularly over time in the face of later code changes. Where
-cleanup code is duplicated, for example in the case of a function with
-multiple exit points, or where the cleanup point is separated by tens
-of lines of code from the creation point, these risks increase
-further.
-
-Another way to look at this is that it is far easier in a real,
-non-trivial piece of code to take an unprotected local (a raw pointer
-to an object) and to apply cleanup protection to it (for example if a
-call to a leaving function has been added) once at its point of
-creation, than it is to study what might be a quite complex flow of
-control in order to determine where all the matching calls to
-CleanupStack::PopAndDestroy() need to go.
-
-In some cases, faced with the CleanupStack, you might actually choose
-to rework an existing function to have a single exit point to simplify
-the process of leave-protecting its code. The risks inherent in that
-are not necessary using the mode of protection offered by these new
-APIs.
-
-\b General.7 <em>These APIs seem to come with a lot of new rules,
-particularly when it comes to interoperating with existing
-functionality. If it turns out people need to understand both the new
-and old idioms in order to mix them safely, where's the benefit?
-Doesn't it actually make things worse?</em>
-
-The interoperability constraints are far from ideal, but we believe
-they are manageable and that the benefits outweigh the issues,
-particularly so for developers working on new code that uses these new
-APIs and idioms consistently.
-
-Wherever possible sanity checking will be offered in code analysis
-tools like Leavescan and/or in UDEB runtime checking via assertions.
-
-\b Cleanedup.1 <em>The LCleanedupXxx/LManagedXxx distinction is confusing. Why can't we
-just use the same classes everywhere?</em>
-
-We would much prefer to be able to use the same classes to protect
-objects referenced from local variables as we do to project objects
-referenced from data members. In an ideal world, the LManagedXxx
-classes would be used in both scenarios (just like auto_ptr is
-elsewhere); LCleanedupXxx would not be necessary.
-
-In fact, the LManagedXxx classes can be used to protect locals if you
-wish:
-
-@code
-{
-LManagedPtr<CQuery> query(CQuery::NewL());
-query->BuildQueryL();
-query->ExecuteQueryL();
-} // query deleted on normal scope exit or leave
-@endcode
-
-This works fine in isolation. Unfortunately, cleanup order becomes
-counter-intuitive if calls to functions that use LManagedXxx are mixed
-with functions that use the cleanup stack with the same call stack.
-
-Here is an example. Call order is top-to-bottom.
-
-@code
-void CFramework::StartMainLoopL()
- {
- CFramework* fw = CFramework::NewL();
- CleanupStack::PushL(fw); // #1
- // ...
- CleanupStack::PushL(event); // #2
- fw->DispatchL(*event);
- CleanupStack::PopAndDestroy(event);
- // ...
- CleanupStack::PopAndDestroy(fw);
- }
-
-void CFramework::DispatchL(CEvent& aEvent)
- {
- this->UserCallback()(*this, aEvent);
- }
-
-void MyUserCallback(CFramework& aFw, CEvent& aEvent)
- {
- LManagedPtr<CMyEventWrapper> myEvent(CMyEventWrapper::NewL(aEvent)); // #3
- // ...
- aFw->LookupL(arg);
- // ...
- }
-
-void CFramework::LookupL(const TDesC& aArg)
- {
- //
- CleanupStack::PushL(tmp); // #4
- // ...
- User::LeaveIfError(status);
- // ...
- CleanupStack::PopAndDestroy(tmp);
- }
-@endcode
-
-If the User::LeaveIfError() expression triggers an unhandled leave in
-the above, the cleanup order would be: #4, #2, #1, #3. If out-of-order
-execution of CMyEventWrapper's destructor can never cause problems,
-then there is not an issue. However, if CMyEventWrapper's destructor
-were to e.g. decrement a reference count on the (deleted) CEvent, this
-would lead to a panic.
-
-The cleanup order is this way because of the way User::Leave()
-processing works. It locates all pushed CleanupStack items up to the
-point of the handling TRAP and executes their cleanups. Then, finally,
-it uses C++ throw to unwind the C stack to the point of the TRAP. It
-is during C stack unwinding that the destructors for objects stored in
-locals get run, and LManagedPtr (like auto_ptr) relies exclusively on
-destructor execution to trigger cleanup.
-
-On the other hand, if MyUserCallback uses LCleanedupPtr instead of
-LManagedPtr, then its associated cleanup is triggered as part of
-CleanupStack processing and in the more intuitive sequence: #4, #3,
-#2, #1. Note that although it also has a destructor, LCleanedupPtr's
-cleanup action is only ever run once; execution of the cleanup action
-via the destructor is disabled if the cleanup action has already been
-run as part of CleanupStack processing.
-
-This is why the LCleanedupXxx classes exist. Because the situations
-where use of LManagedXxx for locals (or more precisely the resulting
-out-of-order cleanup) may cause problems are subtle to characterise,
-we guide conservatively that LCleanedupXxx should always be used to
-protect locals.
-
-\b Cleanedup.2 <em>If you are forced to call an LC method, how should you deal with it?</em>
-
-APIs should always offer pure L variants (after all, what if you want
-to store the result directly in a data member?) and this scenario
-should be rare. If it does arise, however, you have a few options.
-
-Note that code checking tools like Leavescan can flag dangerous
-combinations of LC method calls and the LCleanedupXxx classes within
-the same function.
-
-Option 1 (preferred):
-
-@code
-// Define your own popping L wrapper function
-CFoo* NewCFooL(TFooArg aArg)
- {
- CFoo* foo = CFoo::NewLC(aArg);
- CleanupStack::Pop();
- return foo;
- }
-
-// Then call that instead...
-{
-LCleanedupPtr<CFoo> foo(NewCFooL(arg));
-// ...
-}
-
-@endcode
-
-Option 2:
-
-@code
-{
-LCleanedupPtr<CFoo> foo; // pushes our "smart" cleanup item on the stack
-foo = CFoo::NewLC(arg); // leaves a classic cleanup item on the stack
-CleanupStack::Pop(); // gets rid of the classic cleanup item right away
-// ...
-}
-@endcode
-
-Never do this:
-
-@code
-{
-LCleanedupPtr<CFoo> foo(CFoo::NewLC(arg));
-// Execution order of the above statement leaves our "smart" cleanup item
-// on top of the cleanup stack and we can't get at the LC-introduced cleanup
-// item beneath it to pop it
-// ...
-}
-@endcode
-
-\b Cleanedup.3 <em>How do you create your own custom cleanup operation a la TCleanupItem?</em>
-
-The direct analog to pushing a TCleanupItem is ::LCleanedupGuard; see
-its documentation for an example of how to register a function pointer
-with argument data to get invoked on cleanup.
-
-See also #DEFINE_CLEANUP_FUNCTION and #DEFINE_CLEANUP_STRATEGY for
-creating custom cleanup operations for use with particular classes.
-
-\b Managed.1 <em>For LManagedXxx, is destruction order based on order of
-declaration?</em>
-
-Yes, fields are destroyed (and so the cleanup operation run in the
-case of LManagedXxx fields) in reverse order of declaration as
-specified by the C++ standard.
-
-\b Managed.2 <em>Does tying cleanup order to data member order make it
-harder to maintain binary compatibility? If I want to change
-construction/destruction order I'm forced to change my header and
-reorder my data members?</em>
-
-Reordering private fields would not constitute a BC break because the
-class would not change size. In situations where your data members are
-anything other than private, including being directly revealed by
-inline methods, you always have to take great care, and will continue
-to have to do so.
-
-As a general guideline, if you are concerned about BC never make data
-members (LManagedXxx or otherwise) anything other than private. Always
-expose them via non-inline accessor methods, both to clients and to
-derived classes.
-
-\b Managed.3 <em>What happens when you mix managed and unmanaged
-pointers in the same class? Should it be avoided?</em>
-
-Your manually-written destructor code for a class will get run before
-the managed fields of that class get cleaned up, as per the C++
-standard. As long as this is understood, there is no particular reason
-to avoid mixing if it makes sense to your problem.
-
-Note, though, that if you are using single-phase construction and the
-constructor leaves, your destructor will not be run; only the
-instance's fully-constructed data members at the point of the leave
-will be destroyed.
-
-In some cases using ::LManagedGuard may be preferable to adding code
-to the destructor.
-
-\b SinglePhase.1 <em>Do you have to use single-phase construction with
-these APIs?</em>
-
-No. The primary benefit of using the LManagedXxx classes to look after
-your data members is to avoid having to write and maintain destructor
-code manually. It's fine to initialize your LManagedXxx fields by
-assignment in ConstructL if you're using two-phase construction; the
-automatic cleanup benefit is the same.
-
-The LManagedXxx classes also happen to enable the use of single-phase
-construction, but you need to consider carefully when and whether to
-use it.
-
-\b SinglePhase.2 <em>The single-phase constructor solution with
-CONSTRUCTORS_MAY_LEAVE is a bit of a mess, and not really helping to
-simplify code?</em>
-
-Yes. Unfortunately the need for #CONSTRUCTORS_MAY_LEAVE is forced by
-Symbian's legacy handling new(ELeave).
-
-\b SinglePhase.3 <em>Why and where would I ever use single-phase
-construction?</em>
-
-For classes not intended for derivation there is no issue, and it's
-quite reasonable to use the more concise single-phase construction
-idiom, typically still hidden behind a NewL.
-
-For abstract framework classes intended for derivation outside the
-defining module, the single-phase/two-phase distinction would need to
-be clearly documented and so would force awareness of at least some of
-the issues described here, even in scenarios where the deriving client
-was not intending to use the new idioms. This is probably not
-desirable.
-
-\b OrLeave.1 <em>Can you still use User::LeaveIfError() now that
-OR_LEAVE is available? What if you want to locally-handle some error
-cases but not others.</em>
-
-Yes, #OR_LEAVE is simply a convenience macro that allows you to
-deemphasize auxiliary error checking code in most cases. You can still
-bind an error code manually, check it, and then use
-User::LeaveIfError().
-
-\b Strings.1 <em>Why derive LString from RBuf and then hide parts of
-the inherited RBuf/TDes API?</em>
-
-We want maximum interoperability with existing code and APIs for
-LString in order to maximise its usefulness. In order to achieve that
-we derive from RBuf, allowing an LString instance to be passed
-directly as a const TDesC, a TDes, or an RBuf.
-
-The trade-off is that parts of the RBuf API don't fit well with
-LString. To be conservative, we have hidden anything inherited from
-RBuf or TDes that we have found to be confusing to direct users of
-LString (you can add things later to a new API, but you can less
-easily take them away). The most obvious of these is the mass hiding
-of of the non-leaving descriptor methods for which LString provides
-leaving, auto-growing alternatives: e.g. for direct users of LString,
-we hide Append() so that it can't be used accidentally instead of
-AppendL().
-
-Note that when passed as a TDes or RBuf, and viewed through a variable
-of that type, this localised hiding within LString does not have any
-effect; existing code handed an LString will be able to manipulate it
-as it expects to.
-
-\b Strings.2 <em>Does LString support TDesC/TDes features like char*
-interop?</em>
-
-LString is an RBuf, a TDes, and a TDesC, and retains all the
-functionality of those classes.
-
-LString8 retains the same level of char* interop as existing
-descriptor classes through support for initialization from TUint8*
-zero-terminated C strings, the ZeroTerminateL() utility method, Ptr(),
-and so on.
-
-\b Strings.3 <em>Does LString auto-compress as well as auto-grow?</em>
-
-They don't. It can be hard to avoid pathologies when second-guessing
-when client code if finished with buffer capacity.
-
-*/
--- a/lowlevellibsandfws/pluginfw/Framework/Example/EComExample7.RSS Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/Example/EComExample7.RSS Mon May 03 14:06:43 2010 +0300
@@ -39,4 +39,5 @@
};
}
};
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
--- a/lowlevellibsandfws/pluginfw/Framework/Example/EComExample8.rss Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/Example/EComExample8.rss Mon May 03 14:06:43 2010 +0300
@@ -40,4 +40,5 @@
};
}
};
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
--- a/lowlevellibsandfws/pluginfw/Framework/Example/EComExampleBadData.RSS Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/Example/EComExampleBadData.RSS Mon May 03 14:06:43 2010 +0300
@@ -43,4 +43,5 @@
};
}
};
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
--- a/lowlevellibsandfws/pluginfw/Framework/Example/EComExampleBadData1.RSS Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/Example/EComExampleBadData1.RSS Mon May 03 14:06:43 2010 +0300
@@ -115,4 +115,5 @@
};
}
};
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
--- a/lowlevellibsandfws/pluginfw/Framework/Example/EComExampleBadData2.RSS Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/Example/EComExampleBadData2.RSS Mon May 03 14:06:43 2010 +0300
@@ -132,4 +132,5 @@
};
}
};
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
--- a/lowlevellibsandfws/pluginfw/Framework/Example/ecomexample12invalid.rss Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/Example/ecomexample12invalid.rss Mon May 03 14:06:43 2010 +0300
@@ -39,4 +39,5 @@
};
}
};
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
--- a/lowlevellibsandfws/pluginfw/Framework/Example/ecomexample12upgraded.rss Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/Example/ecomexample12upgraded.rss Mon May 03 14:06:43 2010 +0300
@@ -43,4 +43,5 @@
};
}
};
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
--- a/lowlevellibsandfws/pluginfw/Framework/Example/ecomexample15.rss Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/Example/ecomexample15.rss Mon May 03 14:06:43 2010 +0300
@@ -43,4 +43,5 @@
};
}
};
- }
\ No newline at end of file
+ }
+
\ No newline at end of file
--- a/lowlevellibsandfws/pluginfw/Framework/ResolverTest/t_resolver.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/ResolverTest/t_resolver.cpp Mon May 03 14:06:43 2010 +0300
@@ -88,7 +88,7 @@
LOCAL_D RTest test(_L("t_resolver.exe"));
-LOCAL_D TCapabilitySet dummycaps;
+//LOCAL_D TCapabilitySet dummycaps;
// Utility clean up function
LOCAL_C void CleanupEComPtrArray(TAny* aArray);
--- a/lowlevellibsandfws/pluginfw/Framework/ResolverTest/t_resolvercache.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/ResolverTest/t_resolvercache.cpp Mon May 03 14:06:43 2010 +0300
@@ -1324,57 +1324,57 @@
CopyPluginsL();
test.Next(_L("Basic TestCounterWrapAroundL"));
- DoBasicTestL(TestCounterWrapAroundL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestCounterWrapAroundL);
test.Next(_L("Basic TestUpgradingCachedResolverL"));
- DoBasicTestL(TestUpgradingCachedResolverL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestUpgradingCachedResolverL);
test.Next(_L("Basic TestCacheQueueFullPattern1L"));
- DoBasicTestL(TestCacheQueueFullPattern1L);
+ DoBasicTestL(&CCustomResolverCacheTest::TestCacheQueueFullPattern1L);
test.Next(_L("Basic TestCacheQueueFullPattern2L"));
- DoBasicTestL(TestCacheQueueFullPattern2L);
+ DoBasicTestL(&CCustomResolverCacheTest::TestCacheQueueFullPattern2L);
test.Next(_L("Basic TestCacheQueueFullPattern3L"));
- DoBasicTestL(TestCacheQueueFullPattern3L);
+ DoBasicTestL(&CCustomResolverCacheTest::TestCacheQueueFullPattern3L);
test.Next(_L("Basic TestCacheTimerAccuracyL"));
- DoBasicTestL(TestCacheTimerAccuracyL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestCacheTimerAccuracyL);
test.Next(_L("Basic TestTimestampUpdateOnCacheHitL"));
- DoBasicTestL(TestTimestampUpdateOnCacheHitL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestTimestampUpdateOnCacheHitL);
test.Next(_L("Basic TestSWIDisableRwResolverCachingL"));
- DoBasicTestL(TestSWIDisableRwResolverCachingL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestSWIDisableRwResolverCachingL);
test.Next(_L("Basic TestBurDisableRwResolverCachingL"));
- DoBasicTestL(TestBurDisableRwResolverCachingL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestBurDisableRwResolverCachingL);
test.Next(_L("Basic TestClockChangeHasNoEffectOnCacheTimeoutL"));
- DoBasicTestL(TestClockChangeHasNoEffectOnCacheTimeoutL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestClockChangeHasNoEffectOnCacheTimeoutL);
test.Next(_L("Basic TestCacheSizeZeroL"));
- DoBasicTestL(TestCacheSizeZeroL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestCacheSizeZeroL);
test.Next(_L("Basic TestCacheTimeoutZeroL"));
- DoBasicTestL(TestCacheTimeoutZeroL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestCacheTimeoutZeroL);
test.Next(_L("Basic TestResolverWithBadProxyTable"));
- DoBasicTestL(TestResolverWithBadProxyTable);
+ DoBasicTestL(&CCustomResolverCacheTest::TestResolverWithBadProxyTable);
// Only run OOM on tests which do not involve rescan dir.
test.Next(_L("OOM TestCacheQueueFullPattern3L"));
- DoOOMTestL(TestCacheQueueFullPattern3L);
+ DoOOMTestL(&CCustomResolverCacheTest::TestCacheQueueFullPattern3L);
test.Next(_L("OOM TestCacheTimerAccuracyL"));
- DoOOMTestL(TestCacheTimerAccuracyL);
+ DoOOMTestL(&CCustomResolverCacheTest::TestCacheTimerAccuracyL);
test.Next(_L("OOM TestTimestampUpdateOnCacheHitL"));
- DoOOMTestL(TestTimestampUpdateOnCacheHitL);
+ DoOOMTestL(&CCustomResolverCacheTest::TestTimestampUpdateOnCacheHitL);
// Do all tests affected by Lazy DLL unload last.
test.Next(_L("Basic TestDeletingCachedResolverL"));
- DoBasicTestL(TestDeletingCachedResolverL);
+ DoBasicTestL(&CCustomResolverCacheTest::TestDeletingCachedResolverL);
}
static TInt KillEComServer()
--- a/lowlevellibsandfws/pluginfw/Framework/frame/RegistryData.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/frame/RegistryData.cpp Mon May 03 14:06:43 2010 +0300
@@ -2158,6 +2158,11 @@
TInterfaceIndex* index=reinterpret_cast<TInterfaceIndex*>(aObject);
index->Reset();
}
+void CRegistryData::RemoveImplFromImplIndexCleanUp(TAny* aPtr)
+ {
+ TCleanupImplIndexEntry *aCleanup = (TCleanupImplIndexEntry*)aPtr;
+ aCleanup->iRegistryData->RemoveImplByAddrFromImplIndex(aCleanup->iImplEntry);
+ }
/**
This method retrieves the data for security checks from the iInterfaceImplIndex
@@ -2287,7 +2292,7 @@
TImplContainer& implContainer = implContainerArray[aImplPosInContainerArray];
CImplementationData* oldImpl = implContainer.iCurrentImpl;
implContainer.iUnusedImpls.AppendL(oldImpl);
- RemoveImplFromImplIndex(oldImpl); // ignore return code
+ RemoveImplByAddrFromImplIndex(oldImpl); // ignore return code
implContainer.iCurrentImpl = aNewImpl;
// We are replacing existing impl with aNewImpl. If existing
@@ -2324,7 +2329,10 @@
if(aIfPosInInterfaceImplIndex==KErrNotFound)
{
- iInterfaceImplIndex.InsertInOrderL(aNewIfIndexEl, TLinearOrder<TInterfaceIndex>(TInterfaceStruct::CompareInfUid));
+ TCleanupImplIndexEntry aCleanup(this, aNewImpl);
+ CleanupStack::PushL(TCleanupItem(RemoveImplFromImplIndexCleanUp,&aCleanup));
+ iInterfaceImplIndex.InsertInOrderL(aNewIfIndexEl, TLinearOrder<TInterfaceIndex>(TInterfaceStruct::CompareInfUid));
+ CleanupStack::Pop();
}
}
@@ -2347,11 +2355,13 @@
index.iInterfaceUid = interface->iInterfaceUid;
TInt indexPos = iInterfaceImplIndex.FindInOrder(index,TLinearOrder<TInterfaceIndex>(TInterfaceStruct::CompareInfUid));
-
+ TImplContainerArray* impDataArray = NULL;
+ TInt implCount=0;
+
if(indexPos!=KErrNotFound)
{
- TImplContainerArray* impDataArray = &(iInterfaceImplIndex[indexPos].iImpData);
- TInt implCount=interface->iImplementations->Count();
+ impDataArray = &(iInterfaceImplIndex[indexPos].iImpData);
+ implCount=interface->iImplementations->Count();
for(TInt i=0; i<implCount; i++)
{
implStruct.iCurrentImpl = (*interface->iImplementations)[i];
@@ -2374,7 +2384,7 @@
if(implContainer.iCurrentImpl->iParent->iParent == aDllData)
{
// do not care about the return code.
- RemoveImplFromImplIndex(implContainer.iCurrentImpl);
+ RemoveImplByAddrFromImplIndex(implContainer.iCurrentImpl);
TInt implContainerUnusedImplCount=implContainer.iUnusedImpls.Count();
// no unused impl's therefore no rollback and remove entry
@@ -2417,6 +2427,13 @@
}
}
}
+ //To make sure it is removed from the implIndex no matter what and that the return code is ignored.
+ //The previous removal is still required so that a subsequent InsertImplIntoImplIndex is possible
+ //for an implementation. e.g. an implementaion is on different drives and only one of htem was removed.
+ // The other one should now make it to the iImplIndex through InsertImplIntoImplIndex. If it wasn't
+ // removed, before the insert operation, it will fail since both the implementations hav the same
+ // impl UID.
+ RemoveImplByAddrFromImplIndex((*interface->iImplementations)[i]);
}
if(impDataArray->Count() == 0)
{
@@ -2460,22 +2477,26 @@
}
}
-/** This method removes the specified entry from iImplIndex.
+
+/** This method does a search by address and removes the specified entry from iImplIndex.
-@param aPtr is the entry to remove
+@param aPtr is the entry to remove
@return True if aPtr is removed from iImplIndex. False if aPtr is not
- in iImplIndex, i.e. nothing is removed.
+ in iImplIndex, i.e. nothing is removed.
*/
-TBool CRegistryData::RemoveImplFromImplIndex(CImplementationData* aPtr) const
- {
- TInt i = iImplIndex.FindInOrder(aPtr, TLinearOrder<CImplementationData>(CImplementationData::CompareImplUid));
- if (i != KErrNotFound)
- {
- // The array does not own the pointer. Do not delete!
- iImplIndex.Remove(i);
- }
- return (i != KErrNotFound);
- }
+TBool CRegistryData::RemoveImplByAddrFromImplIndex(CImplementationData* aPtr) const
+ {
+ TInt aIdx = iImplIndex.Find(aPtr);
+ if (aIdx != KErrNotFound)
+ {
+ // This linear pointer search ensures a safe removal of the impl from iImplIndex so that it is free from a dead object.
+
+ // The array does not own the pointer. Do not delete!
+ iImplIndex.Remove(aIdx);
+ return ETrue;
+ }
+ return EFalse;
+ }
/** This method inserts the entry aNewImpl into iImplIndex.
--- a/lowlevellibsandfws/pluginfw/Framework/frame/RegistryData.h Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Framework/frame/RegistryData.h Mon May 03 14:06:43 2010 +0300
@@ -252,8 +252,12 @@
TBool aLegitimateImpl);
static void ResetTInterfaceIndex(TAny* aObject);
- /** Remove the pointer from iImplIndex */
- TBool RemoveImplFromImplIndex(CImplementationData* aPtr) const;
+ /** Remove the pointer from iImplIndex based on the impl address*/
+ TBool RemoveImplByAddrFromImplIndex(CImplementationData* aPtr) const;
+
+ /** Used to restore the impIndex sanity in case of a leave */
+ static void RemoveImplFromImplIndexCleanUp(TAny* aPtr);
+
/** Insert aNewImpl into iImplIndex. */
TInt InsertImplIntoImplIndex(CImplementationData* aNewImpl) const;
/** Store change in drive state - addition or removal*/
@@ -490,4 +494,14 @@
iUnusedImpls.Reset();
}
+
+ class TCleanupImplIndexEntry
+ {
+ public:
+ TCleanupImplIndexEntry(CRegistryData* aRegData, CRegistryData::CImplementationData* aImpl)
+ : iRegistryData(aRegData), iImplEntry(aImpl)
+ {}
+ CRegistryData* iRegistryData;
+ CRegistryData::CImplementationData* iImplEntry;
+ };
#endif //__REGISTRYDATA_H__
--- a/lowlevellibsandfws/pluginfw/Test_Bed/ComponentInfoTest/ComponentInfoTransitions.inl Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Test_Bed/ComponentInfoTest/ComponentInfoTransitions.inl Mon May 03 14:06:43 2010 +0300
@@ -56,6 +56,8 @@
Context().DataLogger().LogInformation(KComponentInfoDtorTransitMethod);
delete Context().iComponentInfo;
Context().iComponentInfo = NULL;
+ __UHEAP_MARKEND; /*removed from leaktransitiontest.cpp and added here to resolve alloc issue due to removal of reference to RHeap's member variable*/
+
}
inline CComponentInfo_UnitTestContext& CComponentInfo_Dtor_Transition::Context() const
--- a/lowlevellibsandfws/pluginfw/Test_Bed/test_bed/LeakTestTransition.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/lowlevellibsandfws/pluginfw/Test_Bed/test_bed/LeakTestTransition.cpp Mon May 03 14:06:43 2010 +0300
@@ -29,22 +29,11 @@
// Do nothing here
}
-class TestRHeap : public RHeap
- {
-public:
- inline void Set(TAny* aPtr)
- {
- iTestData = aPtr;
- };
- };
-RHeap::SHeapCellInfo s;
-
// Define the overloaded RunL behaviour here
EXPORT_C void CLeakTestTransition::RunL()
{
// Setup leak check and call the base RunL
iThread.HandleCount(iStartProcessHandleCount, iStartThreadHandleCount);
- (static_cast<TestRHeap&>(User::Heap())).Set(&s);
__UHEAP_SETFAIL(RHeap::EDeterministic,iFailStep);
__UHEAP_MARK;
if(iBreakStep == iFailStep)
@@ -141,13 +130,10 @@
}
__UHEAP_MARKEND;
__UHEAP_SETFAIL(RHeap::ENone, KMemoryLeakTestFailInit); // No more fails
- (static_cast<TestRHeap&>(User::Heap())).Set(0);
return KErrNone;
}
EXPORT_C void CLeakTestTransition::PostTransitionCleanup()
{
- __UHEAP_MARKEND;
__UHEAP_SETFAIL(RHeap::ENone, KMemoryLeakTestFailInit); // No more fails
- (static_cast<TestRHeap&>(User::Heap())).Set(0);
}
--- a/ossrv_pub/boost_apis/boost/lexical_cast.hpp Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/boost_apis/boost/lexical_cast.hpp Mon May 03 14:06:43 2010 +0300
@@ -217,7 +217,7 @@
typedef typename detail::array_to_pointer_decay<Source>::type NewSource;
detail::lexical_stream<Target, NewSource> interpreter;
- Target result;
+ Target result = 0;
if(!(interpreter << arg && interpreter >> result))
throw_exception(bad_lexical_cast(typeid(NewSource), typeid(Target)));
--- a/ossrv_pub/configuration/inc/stdapis/stlport/stl/_config.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/configuration/inc/stdapis/stlport/stl/_config.h Mon May 03 14:06:43 2010 +0300
@@ -1011,11 +1011,13 @@
# endif
# if defined (_STLP_DESIGNATED_DLL) /* This is a lib which will contain STLport exports */
# define _STLP_DECLSPEC _STLP_IMPORT_DECLSPEC
+# define _STLP_DUMMY_IMP_DECLSPEC _STLP_DECLSPEC
# define _STLP_EXP_DECLSPEC _STLP_EXPORT_DECLSPEC
# define _STLP_CLASS_DECLSPEC _STLP_CLASS_EXPORT_DECLSPEC
# else
-# define _STLP_DECLSPEC //_STLP_IMPORT_DECLSPEC /* Other modules, importing STLport exports */
-# define _STLP_EXP_DECLSPEC //_STLP_EXPORT_DECLSPEC
+# define _STLP_DECLSPEC _STLP_IMPORT_DECLSPEC /* Other modules, importing STLport exports */
+# define _STLP_DUMMY_IMP_DECLSPEC /* correction for RCT4.0 */
+# define _STLP_EXP_DECLSPEC // _STLP_EXPORT_DECLSPEC
# define _STLP_CLASS_DECLSPEC _STLP_CLASS_IMPORT_DECLSPEC
# undef _STLP_USE_NAMESPACES
# define _STLP_USE_NAMESPACES
--- a/ossrv_pub/debug/inc/stdapis/stlport/stl/debug/_debug.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/debug/inc/stdapis/stlport/stl/debug/_debug.h Mon May 03 14:06:43 2010 +0300
@@ -132,7 +132,7 @@
# endif /* _STLP_DEBUG */
// debug messages and formats
- _STLP_STATIC_MEMBER_DECLSPEC static const char* _Message_table[_StlMsg_MAX];
+ static const char* _Message_table[_StlMsg_MAX];
};
--- a/ossrv_pub/exceptions/inc/stdapis/stlport/stl/_range_errors.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/exceptions/inc/stdapis/stlport/stl/_range_errors.h Mon May 03 14:06:43 2010 +0300
@@ -80,9 +80,10 @@
_STLP_THROW_MSG(out_of_range, __msg);
}
-inline void _STLP_DECLSPEC _STLP_CALL __stl_throw_length_error(const char* __msg) {
+/*inline void _STLP_DECLSPEC _STLP_CALL __stl_throw_length_error(const char* __msg) {
_STLP_THROW_MSG(length_error, __msg);
}
+*/
inline void _STLP_DECLSPEC _STLP_CALL __stl_throw_invalid_argument(const char* __msg) {
_STLP_THROW_MSG(invalid_argument, __msg);
--- a/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_fstream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_fstream.h Mon May 03 14:06:43 2010 +0300
@@ -96,7 +96,7 @@
_STLP_DECLSPEC bool _M_open(const char*, ios_base::openmode, long __protection);
_STLP_DECLSPEC bool _M_open(const char*, ios_base::openmode);
- _STLP_DECLSPEC bool _M_open(int __id, ios_base::openmode = ios_base::__default_mode);
+ bool _M_open(int __id, ios_base::openmode = ios_base::__default_mode);
_STLP_DECLSPEC bool _M_close();
public: // Low-level I/O, like Unix read/write
@@ -687,7 +687,7 @@
public: // Constructors, destructor.
- _STLP_DECLSPEC basic_fstream();
+ _STLP_DUMMY_IMP_DECLSPEC basic_fstream();
explicit basic_fstream(const char* __s,
ios_base::openmode __mod = ios_base::in | ios_base::out) :
basic_ios<_CharT, _Traits>(), basic_iostream<_CharT, _Traits>(0), _M_buf() {
@@ -711,7 +711,7 @@
this->setstate(ios_base::failbit);
}
# endif
- _STLP_DECLSPEC ~basic_fstream();
+ _STLP_DUMMY_IMP_DECLSPEC ~basic_fstream();
public: // File and buffer operations.
--- a/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_istream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_istream.h Mon May 03 14:06:43 2010 +0300
@@ -81,8 +81,8 @@
typedef _Self& (_STLP_CALL *__istream_fn)(_Self&);
public: // Constructor and destructor.
- _STLP_DECLSPEC explicit basic_istream(basic_streambuf<_CharT, _Traits>* __buf);
- _STLP_DECLSPEC ~basic_istream();
+ _STLP_DUMMY_IMP_DECLSPEC explicit basic_istream(basic_streambuf<_CharT, _Traits>* __buf);
+ _STLP_DUMMY_IMP_DECLSPEC ~basic_istream();
public: // Nested sentry class.
@@ -312,8 +312,8 @@
public:
typedef basic_ios<_CharT, _Traits> _Basic_ios;
- _STLP_DECLSPEC explicit basic_iostream(basic_streambuf<_CharT, _Traits>* __buf);
- _STLP_DECLSPEC virtual ~basic_iostream();
+ _STLP_DUMMY_IMP_DECLSPEC explicit basic_iostream(basic_streambuf<_CharT, _Traits>* __buf);
+ _STLP_DUMMY_IMP_DECLSPEC virtual ~basic_iostream();
};
# if defined (_STLP_USE_TEMPLATE_EXPORT)
--- a/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_ostream.c Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_ostream.c Mon May 03 14:06:43 2010 +0300
@@ -225,7 +225,7 @@
// Helper function for numeric output.
template <class _CharT, class _Traits, class _Number>
-basic_ostream<_CharT, _Traits>& _STLP_CALL
+basic_ostream<_CharT, _Traits>&
_M_put_num(basic_ostream<_CharT, _Traits>& __os, _Number __x)
{
typedef typename basic_ostream<_CharT, _Traits>::sentry _Sentry;
--- a/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_ostream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_ostream.h Mon May 03 14:06:43 2010 +0300
@@ -32,7 +32,7 @@
_STLP_BEGIN_NAMESPACE
-template <class _CharT, class _Traits, class _Number>
+template <class _CharT, class _Traits, class _Number>
basic_ostream<_CharT, _Traits>& _STLP_CALL
_M_put_num(basic_ostream<_CharT, _Traits>& __os, _Number __x);
@@ -62,8 +62,8 @@
typedef basic_ios<_CharT, _Traits> _Basic_ios;
public: // Constructor and destructor.
- _STLP_DECLSPEC explicit basic_ostream(basic_streambuf<_CharT, _Traits>* __buf);
- _STLP_DECLSPEC ~basic_ostream();
+ _STLP_DUMMY_IMP_DECLSPEC explicit basic_ostream(basic_streambuf<_CharT, _Traits>* __buf);
+ _STLP_DUMMY_IMP_DECLSPEC ~basic_ostream();
public: // Hooks for manipulators.
typedef basic_ios<_CharT, _Traits>& (_STLP_CALL *__ios_fn)(basic_ios<_CharT, _Traits>&);
--- a/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_sstream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_sstream.h Mon May 03 14:06:43 2010 +0300
@@ -71,11 +71,11 @@
typedef basic_string<_CharT, _Traits, _Alloc> _String;
public: // Constructors, destructor.
- _STLP_DECLSPEC explicit basic_stringbuf(ios_base::openmode __mode
+ _STLP_DUMMY_IMP_DECLSPEC explicit basic_stringbuf(ios_base::openmode __mode
= ios_base::in | ios_base::out);
- _STLP_DECLSPEC explicit basic_stringbuf(const _String& __s, ios_base::openmode __mode
+ _STLP_DUMMY_IMP_DECLSPEC explicit basic_stringbuf(const _String& __s, ios_base::openmode __mode
= ios_base::in | ios_base::out);
- _STLP_DECLSPEC virtual ~basic_stringbuf();
+ _STLP_DUMMY_IMP_DECLSPEC virtual ~basic_stringbuf();
public: // Get or set the string.
_String str() const {
@@ -83,7 +83,7 @@
_M_append_buffer();
return _M_str;
}
- _STLP_DECLSPEC void str(const _String& __s);
+ _STLP_DUMMY_IMP_DECLSPEC void str(const _String& __s);
protected: // Overridden virtual member functions.
virtual int_type underflow();
@@ -231,8 +231,8 @@
typedef ios_base::openmode openmode;
public: // Constructors, destructor.
- _STLP_DECLSPEC basic_stringstream(openmode __mod = ios_base::in | ios_base::out);
- _STLP_DECLSPEC basic_stringstream(const _String& __str,
+ _STLP_DUMMY_IMP_DECLSPEC basic_stringstream(openmode __mod = ios_base::in | ios_base::out);
+ _STLP_DUMMY_IMP_DECLSPEC basic_stringstream(const _String& __str,
openmode __mod = ios_base::in | ios_base::out);
~basic_stringstream();
--- a/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_streambuf.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_streambuf.h Mon May 03 14:06:43 2010 +0300
@@ -85,10 +85,10 @@
_STLP_mutex _M_lock;
public: // Destructor.
- _STLP_DECLSPEC virtual ~basic_streambuf();
+ _STLP_DUMMY_IMP_DECLSPEC virtual ~basic_streambuf();
protected: // The default constructor.
- _STLP_DECLSPEC basic_streambuf();
+ _STLP_DUMMY_IMP_DECLSPEC basic_streambuf();
protected: // Protected interface to the get area.
char_type* eback() const { return _M_gbegin; } // Beginning
@@ -129,21 +129,21 @@
protected: // Virtual buffer management functions.
- _STLP_DECLSPEC virtual basic_streambuf<_CharT, _Traits>* setbuf(char_type*, streamsize);
+ _STLP_DUMMY_IMP_DECLSPEC virtual basic_streambuf<_CharT, _Traits>* setbuf(char_type*, streamsize);
// Alters the stream position, using an integer offset. In this
// class seekoff does nothing; subclasses are expected to override it.
- _STLP_DECLSPEC virtual pos_type seekoff(off_type, ios_base::seekdir,
+ _STLP_DUMMY_IMP_DECLSPEC virtual pos_type seekoff(off_type, ios_base::seekdir,
ios_base::openmode = ios_base::in | ios_base::out);
// Alters the stream position, using a previously obtained streampos. In
// this class seekpos does nothing; subclasses are expected to override it.
- _STLP_DECLSPEC virtual pos_type
+ _STLP_DUMMY_IMP_DECLSPEC virtual pos_type
seekpos(pos_type, ios_base::openmode = ios_base::in | ios_base::out);
// Synchronizes (i.e. flushes) the buffer. All subclasses are expected to
// override this virtual member function.
- _STLP_DECLSPEC virtual int sync();
+ _STLP_DUMMY_IMP_DECLSPEC virtual int sync();
public: // Buffer management.
@@ -166,40 +166,40 @@
// with underflow, before reaching end of file. (-1 is a special value:
// it means that underflow will fail.) Most subclasses should probably
// override this virtual member function.
- _STLP_DECLSPEC virtual streamsize showmanyc();
+ _STLP_DUMMY_IMP_DECLSPEC virtual streamsize showmanyc();
// Reads up to __n characters. Return value is the number of
// characters read.
- _STLP_DECLSPEC virtual streamsize xsgetn(char_type* __s, streamsize __n);
+ _STLP_DUMMY_IMP_DECLSPEC virtual streamsize xsgetn(char_type* __s, streamsize __n);
// Called when there is no read position, i.e. when gptr() is null
// or when gptr() >= egptr(). Subclasses are expected to override
// this virtual member function.
- _STLP_DECLSPEC virtual int_type underflow();
+ _STLP_DUMMY_IMP_DECLSPEC virtual int_type underflow();
// Similar to underflow(), but used for unbuffered input. Most
// subclasses should probably override this virtual member function.
- _STLP_DECLSPEC virtual int_type uflow();
+ _STLP_DUMMY_IMP_DECLSPEC virtual int_type uflow();
// Called when there is no putback position, i.e. when gptr() is null
// or when gptr() == eback(). All subclasses are expected to override
// this virtual member function.
- _STLP_DECLSPEC virtual int_type pbackfail(int_type = traits_type::eof());
+ _STLP_DUMMY_IMP_DECLSPEC virtual int_type pbackfail(int_type = traits_type::eof());
protected: // Virtual put area functions, as defined in
// 27.5.2.4.5 of the standard.
// Writes up to __n characters. Return value is the number of characters
// written.
- _STLP_DECLSPEC virtual streamsize xsputn(const char_type* __s, streamsize __n);
+ _STLP_DUMMY_IMP_DECLSPEC virtual streamsize xsputn(const char_type* __s, streamsize __n);
// Extension: writes up to __n copies of __c. Return value is the number
// of characters written.
- _STLP_DECLSPEC virtual streamsize _M_xsputnc(char_type __c, streamsize __n);
+ _STLP_DUMMY_IMP_DECLSPEC virtual streamsize _M_xsputnc(char_type __c, streamsize __n);
// Called when there is no write position. All subclasses are expected to
// override this virtual member function.
- _STLP_DECLSPEC virtual int_type overflow(int_type = traits_type::eof());
+ _STLP_DUMMY_IMP_DECLSPEC virtual int_type overflow(int_type = traits_type::eof());
public: // Public members for writing characters.
// Write a single character.
@@ -217,7 +217,7 @@
{ return this->_M_xsputnc(__c, __n); }
private: // Helper functions.
- _STLP_DECLSPEC int_type _M_snextc_aux();
+ _STLP_DUMMY_IMP_DECLSPEC int_type _M_snextc_aux();
public: // Public members for reading characters.
@@ -265,10 +265,10 @@
// sets the streambuf's locale to __loc. Note that imbue should
// not (and cannot, since it has no access to streambuf's private
// members) set the streambuf's locale itself.
- _STLP_DECLSPEC virtual void imbue(const locale&);
+ _STLP_DUMMY_IMP_DECLSPEC virtual void imbue(const locale&);
public: // Locale-related functions.
- _STLP_DECLSPEC locale pubimbue(const locale&);
+ _STLP_DUMMY_IMP_DECLSPEC locale pubimbue(const locale&);
locale getloc() const { return _M_locale; }
# ifndef _STLP_NO_ANACHRONISMS
--- a/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_string.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_string.h Mon May 03 14:06:43 2010 +0300
@@ -263,7 +263,7 @@
return _STLP_CONVERT_ALLOCATOR((const allocator_type&)this->_M_end_of_storage, _CharT);
}
- _STLP_DECLSPEC basic_string();
+ _STLP_DUMMY_IMP_DECLSPEC basic_string();
explicit basic_string(const allocator_type& __a)
: _String_base<_CharT,_Alloc>(__a, 8) {
@@ -278,7 +278,7 @@
_STLP_POP_CLEANUP_ITEM
}
- _STLP_DECLSPEC basic_string(const basic_string<_CharT, _Traits, _Alloc>&);
+ _STLP_DUMMY_IMP_DECLSPEC basic_string(const basic_string<_CharT, _Traits, _Alloc>&);
basic_string(const _Self& __s, size_type __pos, size_type __n = npos,
const allocator_type& __a = allocator_type())
@@ -300,7 +300,7 @@
_STLP_POP_CLEANUP_ITEM
}
- _STLP_DECLSPEC basic_string(const _CharT* __s,
+ _STLP_DUMMY_IMP_DECLSPEC basic_string(const _CharT* __s,
const allocator_type& __a = allocator_type());
basic_string(size_type __n, _CharT __c,
@@ -508,7 +508,7 @@
}
void resize(size_type __n) { resize(__n, _M_null()); }
- _STLP_DECLSPEC void reserve(size_type = 0);
+ _STLP_DUMMY_IMP_DECLSPEC void reserve(size_type = 0);
size_type capacity() const { return (this->_M_end_of_storage._M_data - this->_M_start) - 1; }
@@ -675,7 +675,7 @@
_Self& assign(const _CharT* __s)
{ _STLP_FIX_LITERAL_BUG(__s) return assign(__s, __s + _Traits::length(__s)); }
- _STLP_DECLSPEC _Self& assign(size_type __n, _CharT __c);
+ _STLP_DUMMY_IMP_DECLSPEC _Self& assign(size_type __n, _CharT __c);
#ifdef _STLP_MEMBER_TEMPLATES
@@ -802,7 +802,7 @@
#else /* _STLP_MEMBER_TEMPLATES */
- _STLP_DECLSPEC void insert(iterator __p, const _CharT* __first, const _CharT* __last);
+ _STLP_DUMMY_IMP_DECLSPEC void insert(iterator __p, const _CharT* __first, const _CharT* __last);
#endif /* _STLP_MEMBER_TEMPLATES */
@@ -1139,7 +1139,7 @@
size_type find(const _CharT* __s, size_type __pos = 0) const
{ _STLP_FIX_LITERAL_BUG(__s) return find(__s, __pos, _Traits::length(__s)); }
- _STLP_DECLSPEC size_type find(const _CharT* __s, size_type __pos, size_type __n) const;
+ _STLP_DUMMY_IMP_DECLSPEC size_type find(const _CharT* __s, size_type __pos, size_type __n) const;
// WIE: Versant schema compiler 5.2.2 ICE workaround
size_type find(_CharT __c) const
@@ -1154,8 +1154,8 @@
size_type rfind(const _CharT* __s, size_type __pos = npos) const
{ _STLP_FIX_LITERAL_BUG(__s) return rfind(__s, __pos, _Traits::length(__s)); }
- _STLP_DECLSPEC size_type rfind(const _CharT* __s, size_type __pos, size_type __n) const;
- _STLP_DECLSPEC size_type rfind(_CharT __c, size_type __pos = npos) const;
+ _STLP_DUMMY_IMP_DECLSPEC size_type rfind(const _CharT* __s, size_type __pos, size_type __n) const;
+ _STLP_DUMMY_IMP_DECLSPEC size_type rfind(_CharT __c, size_type __pos = npos) const;
public: // find_first_of
@@ -1165,7 +1165,7 @@
size_type find_first_of(const _CharT* __s, size_type __pos = 0) const
{ _STLP_FIX_LITERAL_BUG(__s) return find_first_of(__s, __pos, _Traits::length(__s)); }
- _STLP_DECLSPEC size_type find_first_of(const _CharT* __s, size_type __pos,
+ _STLP_DUMMY_IMP_DECLSPEC size_type find_first_of(const _CharT* __s, size_type __pos,
size_type __n) const;
size_type find_first_of(_CharT __c, size_type __pos = 0) const
@@ -1180,7 +1180,7 @@
size_type find_last_of(const _CharT* __s, size_type __pos = npos) const
{ _STLP_FIX_LITERAL_BUG(__s) return find_last_of(__s, __pos, _Traits::length(__s)); }
- _STLP_DECLSPEC size_type find_last_of(const _CharT* __s, size_type __pos,
+ _STLP_DUMMY_IMP_DECLSPEC size_type find_last_of(const _CharT* __s, size_type __pos,
size_type __n) const;
size_type find_last_of(_CharT __c, size_type __pos = npos) const {
@@ -1196,10 +1196,10 @@
size_type find_first_not_of(const _CharT* __s, size_type __pos = 0) const
{ _STLP_FIX_LITERAL_BUG(__s) return find_first_not_of(__s, __pos, _Traits::length(__s)); }
- _STLP_DECLSPEC size_type find_first_not_of(const _CharT* __s, size_type __pos,
+ _STLP_DUMMY_IMP_DECLSPEC size_type find_first_not_of(const _CharT* __s, size_type __pos,
size_type __n) const;
- _STLP_DECLSPEC size_type find_first_not_of(_CharT __c, size_type __pos = 0) const;
+ _STLP_DUMMY_IMP_DECLSPEC size_type find_first_not_of(_CharT __c, size_type __pos = 0) const;
public: // find_last_not_of
@@ -1210,10 +1210,10 @@
size_type find_last_not_of(const _CharT* __s, size_type __pos = npos) const
{ _STLP_FIX_LITERAL_BUG(__s) return find_last_not_of(__s, __pos, _Traits::length(__s)); }
- _STLP_DECLSPEC size_type find_last_not_of(const _CharT* __s, size_type __pos,
+ _STLP_DUMMY_IMP_DECLSPEC size_type find_last_not_of(const _CharT* __s, size_type __pos,
size_type __n) const;
- _STLP_DECLSPEC size_type find_last_not_of(_CharT __c, size_type __pos = npos) const;
+ _STLP_DUMMY_IMP_DECLSPEC size_type find_last_not_of(_CharT __c, size_type __pos = npos) const;
public: // Substring.
--- a/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_strstream.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/io_stream_api/inc/stdapis/stlport/stl/_strstream.h Mon May 03 14:06:43 2010 +0300
@@ -55,7 +55,7 @@
typedef void (*__free_fn)(void*);
public: // Constructor, destructor
- explicit strstreambuf(streamsize _Initial_capacity = 0);
+ _STLP_DECLSPEC explicit strstreambuf(streamsize _Initial_capacity = 0);
_STLP_DECLSPEC strstreambuf(__alloc_fn, __free_fn);
@@ -144,7 +144,7 @@
_STLP_DECLSPEC explicit istrstream(const char*);
_STLP_DECLSPEC istrstream(char* , streamsize);
_STLP_DECLSPEC istrstream(const char*, streamsize);
- virtual ~istrstream();
+ _STLP_DECLSPEC virtual ~istrstream();
_STLP_DECLSPEC strstreambuf* rdbuf() const;
_STLP_DECLSPEC char* str();
@@ -164,7 +164,7 @@
public:
_STLP_DECLSPEC ostrstream();
_STLP_DECLSPEC ostrstream(char*, int, ios_base::openmode = ios_base::out);
- virtual ~ostrstream();
+ _STLP_DECLSPEC virtual ~ostrstream();
_STLP_DECLSPEC strstreambuf* rdbuf() const;
_STLP_DECLSPEC void freeze(bool = true);
@@ -191,7 +191,7 @@
_STLP_DECLSPEC strstream();
_STLP_DECLSPEC strstream(char*, int, ios_base::openmode = ios_base::in | ios_base::out);
- virtual ~strstream();
+ _STLP_DECLSPEC virtual ~strstream();
_STLP_DECLSPEC strstreambuf* rdbuf() const;
_STLP_DECLSPEC void freeze(bool = true);
--- a/ossrv_pub/localization_function_api/inc/stdapis/stlport/stl/_locale.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/localization_function_api/inc/stdapis/stlport/stl/_locale.h Mon May 03 14:06:43 2010 +0300
@@ -123,12 +123,12 @@
// construct/copy/destroy:
_STLP_DECLSPEC locale();
_STLP_DECLSPEC locale(const locale&) _STLP_NOTHROW;
- explicit locale(const char *);
+ _STLP_DECLSPEC explicit locale(const char *);
locale(const locale&, const char*, category);
// those are for internal use
- locale(_Locale_impl*);
- locale(_Locale_impl*, bool);
+ _STLP_DECLSPEC locale(_Locale_impl*);
+ _STLP_DECLSPEC locale(_Locale_impl*, bool);
public:
--- a/ossrv_pub/localization_function_api/inc/stdapis/stlport/stl/_num_get.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/localization_function_api/inc/stdapis/stlport/stl/_num_get.h Mon May 03 14:06:43 2010 +0300
@@ -272,8 +272,8 @@
}
#endif
-int _STLP_CALL __string_to_float(const string&, float&);
-int _STLP_CALL __string_to_float(const string&, double&);
+_STLP_DECLSPEC int _STLP_CALL __string_to_float(const string&, float&);
+_STLP_DECLSPEC int _STLP_CALL __string_to_float(const string&, double&);
# ifndef _STLP_NO_LONG_DOUBLE
int _STLP_CALL __string_to_float(const string&, long double&);
# endif
--- a/ossrv_pub/localization_function_api/inc/stdapis/stlport/stl/_num_put.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/localization_function_api/inc/stdapis/stlport/stl/_num_put.h Mon May 03 14:06:43 2010 +0300
@@ -154,7 +154,7 @@
extern _STLP_DECLSPEC int _STLP_CALL __string_to_float(const string&, double&);
extern _STLP_DECLSPEC void _STLP_CALL __write_float(string&, ios_base::fmtflags, int, double);
# ifndef _STLP_NO_LONG_DOUBLE
-int _STLP_CALL __string_to_float(const string&, long double&);
+_STLP_DECLSPEC int _STLP_CALL __string_to_float(const string&, long double&);
extern _STLP_DECLSPEC void _STLP_CALL __write_float(string&, ios_base::fmtflags, int, long double);
# endif
--- a/ossrv_pub/memory/inc/stdapis/stlport/stl/_new.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/memory/inc/stdapis/stlport/stl/_new.h Mon May 03 14:06:43 2010 +0300
@@ -155,22 +155,22 @@
# endif /* _STLP_WINCE */
#if defined(__SYMBIAN32__) && !defined(__GCCE__)
-_STLP_DECLSPEC void *operator new(unsigned int aSize);
+IMPORT_C void *operator new(unsigned int aSize);
-_STLP_DECLSPEC void *operator new[](unsigned int aSize);
+IMPORT_C void *operator new[](unsigned int aSize);
#endif
-_STLP_DECLSPEC void operator delete(void* aPtr) __NO_THROW;
+IMPORT_C void operator delete(void* aPtr) __NO_THROW;
-_STLP_DECLSPEC void operator delete[](void* aPtr) __NO_THROW;
+IMPORT_C void operator delete[](void* aPtr) __NO_THROW;
-_STLP_DECLSPEC void* operator new(unsigned int aSize, const std::nothrow_t& /*aNoThrow*/) __NO_THROW;
+IMPORT_C void* operator new(unsigned int aSize, const std::nothrow_t& /*aNoThrow*/) __NO_THROW;
-_STLP_DECLSPEC void* operator new[](unsigned int aSize, const std::nothrow_t& aNoThrow) __NO_THROW;
+IMPORT_C void* operator new[](unsigned int aSize, const std::nothrow_t& aNoThrow) __NO_THROW;
-_STLP_DECLSPEC void operator delete(void* aPtr, const std::nothrow_t& /*aNoThrow*/) __NO_THROW;
+IMPORT_C void operator delete(void* aPtr, const std::nothrow_t& /*aNoThrow*/) __NO_THROW;
-_STLP_DECLSPEC void operator delete[](void* aPtr, const std::nothrow_t& /*aNoThrow*/) __NO_THROW;
+IMPORT_C void operator delete[](void* aPtr, const std::nothrow_t& /*aNoThrow*/) __NO_THROW;
// placement delete
--- a/ossrv_pub/typeinfo/inc/stdapis/stlport/typeinfo.h Fri Apr 16 16:46:38 2010 +0300
+++ b/ossrv_pub/typeinfo/inc/stdapis/stlport/typeinfo.h Mon May 03 14:06:43 2010 +0300
@@ -47,7 +47,7 @@
public:
virtual ~type_info();
bool operator==(const type_info&) const;
- bool operator!=(const type_info&) const;
+ IMPORT_C bool operator!=(const type_info&) const;
bool before(const type_info&) const;
const char* name() const;
private:
--- a/ssl/libcrypto/group/libcrypto.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/ssl/libcrypto/group/libcrypto.mmp Mon May 03 14:06:43 2010 +0300
@@ -59,7 +59,7 @@
CAPABILITY All -Tcb
VENDORID 0x101FB657
-VERSION 0.9
+VERSION 0.10
TARGETTYPE dll
--- a/ssl/libssl/group/libssl.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/ssl/libssl/group/libssl.mmp Mon May 03 14:06:43 2010 +0300
@@ -52,7 +52,7 @@
CAPABILITY All -Tcb
VENDORID 0x101FB657
-VERSION 0.9
+VERSION 0.10
//START WINS
//WIN32_LIBRARY kernel32.lib
--- a/stdcpp/bwins/libstdcppu.def Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/bwins/libstdcppu.def Mon May 03 14:06:43 2010 +0300
@@ -315,7 +315,7 @@
?_M_insert@locale@std@@AAEXPAVfacet@12@AAVid@12@@Z @ 314 NONAME ; void std::locale::_M_insert(class std::locale::facet *, class std::locale::id &)
?_M_invoke_callbacks@ios_base@std@@IAEXW4event@12@@Z @ 315 NONAME ; void std::ios_base::_M_invoke_callbacks(enum std::ios_base::event)
?_M_mmap@_Filebuf_base@std@@QAEPAXJJ@Z @ 316 NONAME ; void * std::_Filebuf_base::_M_mmap(long, long)
- ?_M_open@_Filebuf_base@std@@QAE_NHH@Z @ 317 NONAME ; bool std::_Filebuf_base::_M_open(int, int)
+ ?_M_open@_Filebuf_base@std@@QAE_NHH@Z @ 317 NONAME ABSENT ; bool std::_Filebuf_base::_M_open(int, int)
?_M_open@_Filebuf_base@std@@QAE_NPBDH@Z @ 318 NONAME ; bool std::_Filebuf_base::_M_open(char const *, int)
?_M_open@_Filebuf_base@std@@QAE_NPBDHJ@Z @ 319 NONAME ; bool std::_Filebuf_base::_M_open(char const *, int, long)
?_M_read@_Filebuf_base@std@@QAEHPADH@Z @ 320 NONAME ; int std::_Filebuf_base::_M_read(char *, int)
--- a/stdcpp/eabi/libstdcppu.def Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/eabi/libstdcppu.def Mon May 03 14:06:43 2010 +0300
@@ -475,10 +475,10 @@
_ZNSt9strstreamC1Ev @ 474 NONAME
_ZNSt9strstreamC2EPcii @ 475 NONAME
_ZNSt9strstreamC2Ev @ 476 NONAME
- _ZSt10_M_put_numIcSt11char_traitsIcElERSt13basic_ostreamIT_T0_ES6_T1_ @ 477 NONAME
- _ZSt10_M_put_numIcSt11char_traitsIcEmERSt13basic_ostreamIT_T0_ES6_T1_ @ 478 NONAME
- _ZSt10_M_put_numIcSt11char_traitsIcExERSt13basic_ostreamIT_T0_ES6_T1_ @ 479 NONAME
- _ZSt10_M_put_numIcSt11char_traitsIcEyERSt13basic_ostreamIT_T0_ES6_T1_ @ 480 NONAME
+ _ZSt10_M_put_numIcSt11char_traitsIcElERSt13basic_ostreamIT_T0_ES6_T1_ @ 477 NONAME ABSENT
+ _ZSt10_M_put_numIcSt11char_traitsIcEmERSt13basic_ostreamIT_T0_ES6_T1_ @ 478 NONAME ABSENT
+ _ZSt10_M_put_numIcSt11char_traitsIcExERSt13basic_ostreamIT_T0_ES6_T1_ @ 479 NONAME ABSENT
+ _ZSt10_M_put_numIcSt11char_traitsIcEyERSt13basic_ostreamIT_T0_ES6_T1_ @ 480 NONAME ABSENT
_ZSt12GetCinStreamv @ 481 NONAME
_ZSt13GetCErrStreamv @ 482 NONAME
_ZSt13GetClogStreamv @ 483 NONAME
@@ -692,16 +692,16 @@
_ZTVSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE @ 691 NONAME ; #<VT>#
_ZThn8_NSdD0Ev @ 692 NONAME ; #<thunk>#
_ZThn8_NSdD1Ev @ 693 NONAME ; #<thunk>#
- _ZThn8_NSdD9Ev @ 694 NONAME ; #<thunk>#
+ _ZThn8_NSdD9Ev @ 694 NONAME ABSENT ; #<thunk>#
_ZThn8_NSt13basic_fstreamIcSt11char_traitsIcEED0Ev @ 695 NONAME ; #<thunk>#
_ZThn8_NSt13basic_fstreamIcSt11char_traitsIcEED1Ev @ 696 NONAME ; #<thunk>#
- _ZThn8_NSt13basic_fstreamIcSt11char_traitsIcEED9Ev @ 697 NONAME ; #<thunk>#
+ _ZThn8_NSt13basic_fstreamIcSt11char_traitsIcEED9Ev @ 697 NONAME ABSENT ; #<thunk>#
_ZThn8_NSt13basic_fstreamIwSt11char_traitsIwEED0Ev @ 698 NONAME ; #<thunk>#
_ZThn8_NSt13basic_fstreamIwSt11char_traitsIwEED1Ev @ 699 NONAME ; #<thunk>#
- _ZThn8_NSt13basic_fstreamIwSt11char_traitsIwEED9Ev @ 700 NONAME ; #<thunk>#
+ _ZThn8_NSt13basic_fstreamIwSt11char_traitsIwEED9Ev @ 700 NONAME ABSENT ; #<thunk>#
_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED0Ev @ 701 NONAME ; #<thunk>#
_ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED1Ev @ 702 NONAME ; #<thunk>#
- _ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED9Ev @ 703 NONAME ; #<thunk>#
+ _ZThn8_NSt14basic_iostreamIwSt11char_traitsIwEED9Ev @ 703 NONAME ABSENT ; #<thunk>#
_ZNSt9_MessagesC1Ev @ 704 NONAME
_ZNSt9_MessagesC2Ev @ 705 NONAME
_ZNSt9_MessagesD0Ev @ 706 NONAME
@@ -981,7 +981,7 @@
_ZNSt8ios_base5pwordEi @ 980 NONAME
_ZThn8_NSt9strstreamD0Ev @ 981 NONAME ; #<thunk>#
_ZThn8_NSt9strstreamD1Ev @ 982 NONAME ; #<thunk>#
- _ZThn8_NSt9strstreamD9Ev @ 983 NONAME ; #<thunk>#
+ _ZThn8_NSt9strstreamD9Ev @ 983 NONAME ABSENT ; #<thunk>#
_ZSt4sqrtRKSt7complexIdE @ 984 NONAME
_ZSt4sqrtRKSt7complexIfE @ 985 NONAME
_ZdaPv @ 986 NONAME
@@ -1043,44 +1043,44 @@
_ZSt28Ctype_charT_GetFacetLocaleIdPKc @ 1042 NONAME
_ZSt31Numpunct_charT_GetFacetLocaleIdPKc @ 1043 NONAME
_ZSt33Moneypunct_charT_GetFacetLocaleIdPKc @ 1044 NONAME
- _ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKc @ 1045 NONAME ABSENT
- _ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKw @ 1046 NONAME ABSENT
- _ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1047 NONAME ABSENT
- _ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKc @ 1048 NONAME ABSENT
- _ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKw @ 1049 NONAME ABSENT
- _ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1050 NONAME ABSENT
- _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPc @ 1051 NONAME ABSENT
- _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPw @ 1052 NONAME ABSENT
- _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1053 NONAME ABSENT
- _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPSt20back_insert_iteratorISsE @ 1054 NONAME ABSENT
- _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPc @ 1055 NONAME ABSENT
- _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPw @ 1056 NONAME ABSENT
- _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1057 NONAME ABSENT
- _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPSt20back_insert_iteratorISsE @ 1058 NONAME ABSENT
+ _ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKc @ 1045 NONAME
+ _ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKw @ 1046 NONAME
+ _ZNSt7num_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1047 NONAME
+ _ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKc @ 1048 NONAME
+ _ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKw @ 1049 NONAME
+ _ZNSt7num_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1050 NONAME
+ _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPc @ 1051 NONAME
+ _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPw @ 1052 NONAME
+ _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1053 NONAME
+ _ZNSt7num_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPSt20back_insert_iteratorISsE @ 1054 NONAME
+ _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPc @ 1055 NONAME
+ _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPw @ 1056 NONAME
+ _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1057 NONAME
+ _ZNSt7num_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPSt20back_insert_iteratorISsE @ 1058 NONAME
_ZNSt8numpunctIcE22GetNumPunct_M_groupingEv @ 1059 NONAME ABSENT
_ZNSt8numpunctIwE28GetNumPunct_M_Wchar_groupingEv @ 1060 NONAME ABSENT
- _ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKc @ 1061 NONAME ABSENT
- _ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKw @ 1062 NONAME ABSENT
- _ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1063 NONAME ABSENT
- _ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKc @ 1064 NONAME ABSENT
- _ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKw @ 1065 NONAME ABSENT
- _ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1066 NONAME ABSENT
- _ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPc @ 1067 NONAME ABSENT
- _ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPw @ 1068 NONAME ABSENT
- _ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1069 NONAME ABSENT
- _ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPc @ 1070 NONAME ABSENT
- _ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPw @ 1071 NONAME ABSENT
- _ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1072 NONAME ABSENT
- _ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKc @ 1073 NONAME ABSENT
- _ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKw @ 1074 NONAME ABSENT
- _ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1075 NONAME ABSENT
- _ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKc @ 1076 NONAME ABSENT
- _ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKw @ 1077 NONAME ABSENT
- _ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1078 NONAME ABSENT
- _ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPc @ 1079 NONAME ABSENT
- _ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPw @ 1080 NONAME ABSENT
- _ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1081 NONAME ABSENT
- _ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPc @ 1082 NONAME ABSENT
- _ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPw @ 1083 NONAME ABSENT
- _ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1084 NONAME ABSENT
+ _ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKc @ 1061 NONAME
+ _ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKw @ 1062 NONAME
+ _ZNSt8time_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1063 NONAME
+ _ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKc @ 1064 NONAME
+ _ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKw @ 1065 NONAME
+ _ZNSt8time_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1066 NONAME
+ _ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPc @ 1067 NONAME
+ _ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPw @ 1068 NONAME
+ _ZNSt8time_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1069 NONAME
+ _ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPc @ 1070 NONAME
+ _ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPw @ 1071 NONAME
+ _ZNSt8time_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1072 NONAME
+ _ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKc @ 1073 NONAME
+ _ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPKw @ 1074 NONAME
+ _ZNSt9money_getIcSt19istreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1075 NONAME
+ _ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKc @ 1076 NONAME
+ _ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPKw @ 1077 NONAME
+ _ZNSt9money_getIwSt19istreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1078 NONAME
+ _ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPc @ 1079 NONAME
+ _ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPPw @ 1080 NONAME
+ _ZNSt9money_putIcSt19ostreambuf_iteratorIcSt11char_traitsIcEEE16GetFacetLocaleIdEPS0_IwS1_IwEE @ 1081 NONAME
+ _ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPc @ 1082 NONAME
+ _ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPPw @ 1083 NONAME
+ _ZNSt9money_putIwSt19ostreambuf_iteratorIwSt11char_traitsIwEEE16GetFacetLocaleIdEPS0_IcS1_IcEE @ 1084 NONAME
--- a/stdcpp/group/libstdcpp.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/group/libstdcpp.mmp Mon May 03 14:06:43 2010 +0300
@@ -31,7 +31,7 @@
#ifndef WINSCW
EPOCALLOWDLLDATA
#endif //WINSCW
-VERSION 1.0
+VERSION 1.1
OS_LAYER_SYSTEMINCLUDE
OS_LAYER_LIBC_SYSTEMINCLUDE
--- a/stdcpp/src/ios.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/src/ios.cpp Mon May 03 14:06:43 2010 +0300
@@ -28,8 +28,8 @@
_STLP_BEGIN_NAMESPACE
-char* _STLP_CALL
-__write_integer(char* buf, ios_base::fmtflags flags, long x);
+/*char* _STLP_CALL
+__write_integer(char* buf, ios_base::fmtflags flags, long x);*/
//----------------------------------------------------------------------
// ios_base members
--- a/stdcpp/src/libstd_cpp_init.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/src/libstd_cpp_init.cpp Mon May 03 14:06:43 2010 +0300
@@ -152,7 +152,7 @@
-_STLP_EXP_DECLSPEC void *operator new(unsigned int aSize)
+_STLP_EXP_DECLSPEC void *operator new(unsigned int aSize)__NO_THROW
{
void* __y;
@@ -169,7 +169,7 @@
return __y;
}
-_STLP_EXP_DECLSPEC void *operator new[](unsigned int aSize)
+_STLP_EXP_DECLSPEC void *operator new[](unsigned int aSize)__NO_THROW
{
return ::operator new(aSize);
}
--- a/stdcpp/src/libstdcppwsd.h Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/src/libstdcppwsd.h Mon May 03 14:06:43 2010 +0300
@@ -466,227 +466,227 @@
inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
messages<wchar_t>::GetFacetLocaleId()
{
- return get_libcpp_wsdptr().messages_wchar_id;
- }
-
-template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-num_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<wchar_t, char_traits<wchar_t> >* )
- {
- return get_libcpp_wsdptr().num_get_wchar_istreambuf_iterator_id;
+ return get_libcpp_wsdptr().messages_wchar_id;
}
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+num_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<wchar_t, char_traits<wchar_t> >* )
+ {
+ return get_libcpp_wsdptr().num_get_wchar_istreambuf_iterator_id;
+ }
+
+template <class _CharT, class _InputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
num_get<_CharT, _InputIter>::GetFacetLocaleId(const wchar_t**)
{
- return get_libcpp_wsdptr().num_get_wchar_wchar_const_id;
+ return get_libcpp_wsdptr().num_get_wchar_wchar_const_id;
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+ _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
num_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<wchar_t, char_traits<wchar_t> > *)
- {
- return get_libcpp_wsdptr().num_put_wchar_ostreambuf_iterator_id;
- }
+ {
+ return get_libcpp_wsdptr().num_put_wchar_ostreambuf_iterator_id;
+ }
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
num_put<_CharT, _OutputIter>::GetFacetLocaleId(wchar_t**)
- {
- return get_libcpp_wsdptr().num_put_wchar_wchar_id;
- }
-
-template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-time_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<wchar_t, char_traits<wchar_t> >*)
{
- return get_libcpp_wsdptr().time_get_wchar_istreambuf_iterator_id;
+ return get_libcpp_wsdptr().num_put_wchar_wchar_id;
}
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+time_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<wchar_t, char_traits<wchar_t> >*)
+ {
+ return get_libcpp_wsdptr().time_get_wchar_istreambuf_iterator_id;
+ }
+
+template <class _CharT, class _InputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
time_get<_CharT, _InputIter>::GetFacetLocaleId(const wchar_t**)
{
- return get_libcpp_wsdptr().time_get_wchar_wchar_const_id;
+ return get_libcpp_wsdptr().time_get_wchar_wchar_const_id;
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
time_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<wchar_t, char_traits<wchar_t> >*)
{
- return get_libcpp_wsdptr().time_put_wchar_ostreambuf_iterator_id;
+ return get_libcpp_wsdptr().time_put_wchar_ostreambuf_iterator_id;
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
time_put<_CharT, _OutputIter>::GetFacetLocaleId(wchar_t**)
{
- return get_libcpp_wsdptr().time_put_wchar_wchar_id;
+ return get_libcpp_wsdptr().time_put_wchar_wchar_id;
}
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
money_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<wchar_t, char_traits<wchar_t> >*)
{
- return get_libcpp_wsdptr().money_get_wchar_istreambuf_iterator_id;
+ return get_libcpp_wsdptr().money_get_wchar_istreambuf_iterator_id;
}
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
money_get<_CharT, _InputIter>::GetFacetLocaleId(const wchar_t**)
{
- return get_libcpp_wsdptr().money_get_wchar_wchar_const_id;
+ return get_libcpp_wsdptr().money_get_wchar_wchar_const_id;
+ }
+
+template <class _CharT, class _OutputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+money_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<wchar_t, char_traits<wchar_t> >*)
+ {
+ return get_libcpp_wsdptr().money_put_wchar_ostreambuf_iterator_id;
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-money_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<wchar_t, char_traits<wchar_t> >*)
- {
- return get_libcpp_wsdptr().money_put_wchar_ostreambuf_iterator_id;
- }
-
-template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
money_put<_CharT, _OutputIter>::GetFacetLocaleId(wchar_t**)
- {
- return get_libcpp_wsdptr().money_put_wchar_wchar_id;
- }
+ {
+ return get_libcpp_wsdptr().money_put_wchar_wchar_id;
+ }
# endif //_STLP_NO_WCHAR_T
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
num_get<_CharT, _InputIter>::GetFacetLocaleId()
{
- _InputIter* dummyPtr = NULL;
- return GetFacetLocaleId(dummyPtr);
+ _InputIter* dummyPtr = NULL;
+ return GetFacetLocaleId(dummyPtr);
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
num_put<_CharT, _OutputIter>::GetFacetLocaleId()
- {
- _OutputIter* dummyPtr = NULL;
- return GetFacetLocaleId(dummyPtr);
- }
+ {
+ _OutputIter* dummyPtr = NULL;
+ return GetFacetLocaleId(dummyPtr);
+ }
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
time_get<_CharT, _InputIter>::GetFacetLocaleId()
{
- _InputIter* dummyPtr = NULL;
- return GetFacetLocaleId(dummyPtr);
+ _InputIter* dummyPtr = NULL;
+ return GetFacetLocaleId(dummyPtr);
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
time_put<_CharT, _OutputIter>::GetFacetLocaleId()
- {
- _OutputIter* dummyPtr = NULL;
- return GetFacetLocaleId(dummyPtr);
- }
-
-template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-money_get<_CharT, _InputIter>::GetFacetLocaleId()
{
- _InputIter* dummyPtr = NULL;
- return GetFacetLocaleId(dummyPtr);
- }
-template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-money_put<_CharT, _OutputIter>::GetFacetLocaleId()
- {
- _OutputIter* dummyPtr = NULL;
- return GetFacetLocaleId(dummyPtr);
- }
-
-template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-money_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<char, char_traits<char> >*)
- {
- return get_libcpp_wsdptr().money_get_char_istreambuf_iterator_id;
+ _OutputIter* dummyPtr = NULL;
+ return GetFacetLocaleId(dummyPtr);
}
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+money_get<_CharT, _InputIter>::GetFacetLocaleId()
+ {
+ _InputIter* dummyPtr = NULL;
+ return GetFacetLocaleId(dummyPtr);
+ }
+template <class _CharT, class _OutputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+money_put<_CharT, _OutputIter>::GetFacetLocaleId()
+ {
+ _OutputIter* dummyPtr = NULL;
+ return GetFacetLocaleId(dummyPtr);
+ }
+
+template <class _CharT, class _InputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+money_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<char, char_traits<char> >*)
+ {
+ return get_libcpp_wsdptr().money_get_char_istreambuf_iterator_id;
+ }
+
+template <class _CharT, class _InputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
money_get<_CharT, _InputIter>::GetFacetLocaleId(const char **)
{
- return get_libcpp_wsdptr().money_get_char_char_const_id;
+ return get_libcpp_wsdptr().money_get_char_char_const_id;
+ }
+
+template <class _CharT, class _OutputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+money_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<char, char_traits<char> >*)
+ {
+ return get_libcpp_wsdptr().money_put_char_ostreambuf_iterator_id;
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-money_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<char, char_traits<char> >*)
- {
- return get_libcpp_wsdptr().money_put_char_ostreambuf_iterator_id;
- }
-
-template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
money_put<_CharT, _OutputIter>::GetFacetLocaleId(char**)
- {
- return get_libcpp_wsdptr().money_put_char_char_id;
- }
-
-template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-num_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<char, char_traits<char> >* )
{
- return get_libcpp_wsdptr().num_get_char_istreambuf_iterator_id;
+ return get_libcpp_wsdptr().money_put_char_char_id;
}
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+num_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<char, char_traits<char> >* )
+ {
+ return get_libcpp_wsdptr().num_get_char_istreambuf_iterator_id;
+ }
+
+template <class _CharT, class _InputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
num_get<_CharT, _InputIter>::GetFacetLocaleId(const char**)
{
- return get_libcpp_wsdptr().num_get_char_char_const_id;
+ return get_libcpp_wsdptr().num_get_char_char_const_id;
+ }
+
+template <class _CharT, class _OutputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+num_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<char, char_traits<char> > *)
+ {
+ return get_libcpp_wsdptr().num_put_char_ostreambuf_iterator_id;
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-num_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<char, char_traits<char> > *)
- {
- return get_libcpp_wsdptr().num_put_char_ostreambuf_iterator_id;
- }
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+num_put<_CharT, _OutputIter>::GetFacetLocaleId(char**)
+ {
+ return get_libcpp_wsdptr().num_put_char_char_id;
+ }
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-num_put<_CharT, _OutputIter>::GetFacetLocaleId(char**)
- {
- return get_libcpp_wsdptr().num_put_char_char_id;
- }
-
-template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
num_put<_CharT, _OutputIter>::GetFacetLocaleId(back_insert_iterator<string> *)
- {
- return get_libcpp_wsdptr().num_put_char_back_insert_iterator_id;
- }
-
-template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
-time_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<char, char_traits<char> >*)
{
- return get_libcpp_wsdptr().time_get_char_istreambuf_iterator_id;
+ return get_libcpp_wsdptr().num_put_char_back_insert_iterator_id;
}
template <class _CharT, class _InputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+time_get<_CharT, _InputIter>::GetFacetLocaleId(istreambuf_iterator<char, char_traits<char> >*)
+ {
+ return get_libcpp_wsdptr().time_get_char_istreambuf_iterator_id;
+ }
+
+template <class _CharT, class _InputIter>
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
time_get<_CharT, _InputIter>::GetFacetLocaleId(const char**)
{
- return get_libcpp_wsdptr().time_get_char_char_const_id;
+ return get_libcpp_wsdptr().time_get_char_char_const_id;
}
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
time_put<_CharT, _OutputIter>::GetFacetLocaleId(ostreambuf_iterator<char, char_traits<char> >*)
- {
- return get_libcpp_wsdptr().time_put_char_ostreambuf_iterator_id;
- }
+ {
+ return get_libcpp_wsdptr().time_put_char_ostreambuf_iterator_id;
+ }
template <class _CharT, class _OutputIter>
-inline _STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
+_STLP_STATIC_MEMBER_EXP_DECLSPEC locale::id&
time_put<_CharT, _OutputIter>::GetFacetLocaleId(char**)
{
return get_libcpp_wsdptr().time_put_char_char_id;
--- a/stdcpp/src/ostream.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/src/ostream.cpp Mon May 03 14:06:43 2010 +0300
@@ -26,14 +26,14 @@
// instantiations
template class _STLP_CLASS_DECLSPEC basic_ostream<char, char_traits<char> >;
-template _STLP_EXP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL
+template basic_ostream<char, char_traits<char> >& _STLP_CALL
_M_put_num(basic_ostream<char, char_traits<char> >&, long);
-template _STLP_EXP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL
+template basic_ostream<char, char_traits<char> >& _STLP_CALL
_M_put_num(basic_ostream<char, char_traits<char> >&, unsigned long);
# if defined (_STLP_LONG_LONG)
-template _STLP_EXP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL
+template basic_ostream<char, char_traits<char> >& _STLP_CALL
_M_put_num(basic_ostream<char, char_traits<char> >&, unsigned _STLP_LONG_LONG);
-template _STLP_EXP_DECLSPEC basic_ostream<char, char_traits<char> >& _STLP_CALL
+template basic_ostream<char, char_traits<char> >& _STLP_CALL
_M_put_num(basic_ostream<char, char_traits<char> >&, _STLP_LONG_LONG);
# endif
--- a/stdcpp/src/time_facets.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/src/time_facets.cpp Mon May 03 14:06:43 2010 +0300
@@ -30,8 +30,8 @@
_STLP_BEGIN_NAMESPACE
-char* _STLP_CALL
-__write_integer(char* buf, ios_base::fmtflags flags, long x);
+/*char* _STLP_CALL
+__write_integer(char* buf, ios_base::fmtflags flags, long x);*/
// The function copy_cstring is used to initialize a string
// with a C-style string. Used to initialize the month and weekday
--- a/stdcpp/tsrc/Boost_test/graph/src/dag_longest_paths.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/graph/src/dag_longest_paths.cpp Mon May 03 14:06:43 2010 +0300
@@ -26,8 +26,13 @@
property<edge_weight_t, int> > Graph;
Graph graph;
+
+ #ifdef __ARMCC__
+ #pragma diag_suppress 550
+ #endif
Graph::vertex_descriptor v1, v2, v3, v4;
+
v1 = add_vertex(graph);
v2 = add_vertex(graph);
v3 = add_vertex(graph);
--- a/stdcpp/tsrc/Boost_test/graph/src/floyd_warshall_test.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/graph/src/floyd_warshall_test.cpp Mon May 03 14:06:43 2010 +0300
@@ -133,7 +133,7 @@
}
- bool bellman, floyd1, floyd2, floyd3;
+ bool bellman = true, floyd1 = true, floyd2 = true, floyd3 = true;
std::less<int> compare;
inf_plus<int> combine;
floyd1 =
@@ -310,7 +310,7 @@
}
- bool bellman, floyd1, floyd2, floyd3;
+ bool bellman = true, floyd1 = true, floyd2 = true, floyd3 = true;
std::less<int> compare;
inf_plus<int> combine;
floyd1 =
--- a/stdcpp/tsrc/Boost_test/graph/src/isomorphism.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/graph/src/isomorphism.cpp Mon May 03 14:06:43 2010 +0300
@@ -118,19 +118,22 @@
std::map<graph1::vertex_descriptor, graph2::vertex_descriptor> mapping;
- bool isomorphism_correct;
+ bool isomorphism_correct = true;
clock_t start = clock();
+
+ isomorphism_correct = isomorphism(g1, g2, isomorphism_map(make_assoc_property_map(mapping)));
- BOOST_CHECK(isomorphism_correct = isomorphism
- (g1, g2, isomorphism_map(make_assoc_property_map(mapping))));
+ BOOST_CHECK(isomorphism_correct);
clock_t end = clock();
std::cout << "Elapsed time (clock cycles): " << (end - start) << std::endl;
- bool verify_correct;
- BOOST_CHECK(verify_correct =
- verify_isomorphism(g1, g2, make_assoc_property_map(mapping)));
+ bool verify_correct = true;
+
+ verify_correct = verify_isomorphism(g1, g2, make_assoc_property_map(mapping));
+
+ BOOST_CHECK(verify_correct);
if (!isomorphism_correct || !verify_correct) {
// Output graph 1
--- a/stdcpp/tsrc/Boost_test/math/test/src/common_factor_test.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/math/test/src/common_factor_test.cpp Mon May 03 14:06:43 2010 +0300
@@ -57,6 +57,9 @@
// Lifetime management (use automatic destructor and copy constructor)
my_wrapped_integer( int_type const &v = int_type() ) : v_( v ) {}
+#ifdef __ARMCC__
+#pragma diag_suppress 177
+#endif
// Accessors
int_type value() const { return this->v_; }
@@ -85,6 +88,7 @@
self_type &operator |=(self_type const &r) {this->v_ |= r.v_; return *this;}
self_type &operator ^=(self_type const &r) {this->v_ ^= r.v_; return *this;}
+
// Input & output
friend std::istream & operator >>( std::istream &i, self_type &x )
{ return i >> x.v_; }
--- a/stdcpp/tsrc/Boost_test/math/test/src/log1p_expm1_test.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/math/test/src/log1p_expm1_test.cpp Mon May 03 14:06:43 2010 +0300
@@ -559,13 +559,14 @@
//
// C99 Appendix F special cases:
static const T zero = 0;
- static const T m_one = -1;
+
BOOST_CHECK_EQUAL(boost::math::log1p(zero), zero);
BOOST_CHECK_EQUAL(boost::math::log1p(-zero), zero);
BOOST_CHECK_EQUAL(boost::math::expm1(zero), zero);
if(std::numeric_limits<T>::has_infinity)
{
- #ifndef __SYMBIAN32__
+ #ifndef __SYMBIAN32__
+ static const T m_one = -1;
BOOST_CHECK_EQUAL(boost::math::log1p(m_one), -std::numeric_limits<T>::infinity());
BOOST_CHECK_EQUAL(boost::math::expm1(-std::numeric_limits<T>::infinity()), m_one);
#endif
--- a/stdcpp/tsrc/Boost_test/multi_array/src/iterators.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/multi_array/src/iterators.cpp Mon May 03 14:06:43 2010 +0300
@@ -86,7 +86,7 @@
// const iterators constructed from iterators.
{
typename Array::iterator i1;
- typename Array::const_iterator ci1;
+// typename Array::const_iterator ci1;
typename Array::reverse_iterator r1;
typename Array::const_reverse_iterator cr1;
--- a/stdcpp/tsrc/Boost_test/multi_index/src/test_special_set_ops.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/multi_index/src/test_special_set_ops.cpp Mon May 03 14:06:43 2010 +0300
@@ -22,7 +22,7 @@
static int string_to_int(const std::string& str)
{
std::istringstream iss(str);
- int res;
+ int res = 0;
iss>>res;
return res;
}
--- a/stdcpp/tsrc/Boost_test/property_map/src/dynamic_properties_test.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/property_map/src/dynamic_properties_test.cpp Mon May 03 14:06:43 2010 +0300
@@ -140,5 +140,5 @@
close_log_file();
#endif
return 0;
- return boost::exit_success;
+// return boost::exit_success;
}
--- a/stdcpp/tsrc/Boost_test/ptr_container/src/ptr_set.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/ptr_container/src/ptr_set.cpp Mon May 03 14:06:43 2010 +0300
@@ -13,6 +13,10 @@
#include "associative_test_data.hpp"
#include <boost/ptr_container/ptr_set.hpp>
+#ifdef __ARMCC__
+#pragma diag_suppress 3017
+#endif
+
template< class SetDerived, class SetBase, class T >
void test_transfer()
{
--- a/stdcpp/tsrc/Boost_test/smart_ptr/src/lw_mutex_test.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/smart_ptr/src/lw_mutex_test.cpp Mon May 03 14:06:43 2010 +0300
@@ -25,6 +25,10 @@
int main()
{
std_log(LOG_FILENAME_LINE,"[Test Case for lw_mutex_test]");
+
+ #ifdef __ARMCC__
+ #pragma diag_suppress 177
+ #endif
boost::detail::lightweight_mutex::scoped_lock lock1( m1 );
boost::detail::lightweight_mutex m2;
@@ -32,6 +36,8 @@
boost::detail::lightweight_mutex::scoped_lock lock2( m2 );
boost::detail::lightweight_mutex::scoped_lock lock3( m3 );
+
+
#ifdef __SYMBIAN32__
std_log(LOG_FILENAME_LINE,"Result : Passed");
--- a/stdcpp/tsrc/Boost_test/smart_ptr/src/pointer_to_other_test.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/smart_ptr/src/pointer_to_other_test.cpp Mon May 03 14:06:43 2010 +0300
@@ -39,6 +39,9 @@
std_log(LOG_FILENAME_LINE,"[Test Case for pointer_to_other_test]");
// shared_ptr
+ #ifdef __ARMCC__
+ #pragma diag_suppress 550
+ #endif
assert_same_type< boost::pointer_to_other< boost::shared_ptr<X>, Y >::type, boost::shared_ptr<Y> >();
assert_same_type< boost::pointer_to_other< boost::shared_ptr<X>, void >::type, boost::shared_ptr<void> >();
assert_same_type< boost::pointer_to_other< boost::shared_ptr<void>, Y >::type, boost::shared_ptr<Y> >();
@@ -79,6 +82,7 @@
assert_same_type< boost::pointer_to_other< X *, void >::type, void * >();
assert_same_type< boost::pointer_to_other< void *, Y >::type, Y * >();
+
#ifdef __SYMBIAN32__
std_log(LOG_FILENAME_LINE,"Result : Passed");
--- a/stdcpp/tsrc/Boost_test/test_framework/src/compiler_log_formatter.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/test_framework/src/compiler_log_formatter.cpp Mon May 03 14:06:43 2010 +0300
@@ -41,7 +41,7 @@
// ************** compiler_log_formatter ************** //
// ************************************************************************** //
-void
+EXPORT_C void
compiler_log_formatter::log_start( std::ostream& output, counter_t test_cases_amount )
{
if( test_cases_amount > 0 )
@@ -51,7 +51,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::log_finish( std::ostream& )
{
// do nothing
@@ -59,7 +59,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::log_build_info( std::ostream& output )
{
output << "Platform: " << BOOST_PLATFORM << '\n'
@@ -72,7 +72,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::test_unit_start( std::ostream& output, test_unit const& tu )
{
output << "Entering test " << tu.p_type_name << " \"" << tu.p_name << "\"" << std::endl;
@@ -80,7 +80,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::test_unit_finish( std::ostream& output, test_unit const& tu, unsigned long elapsed )
{
output << "Leaving test " << tu.p_type_name << " \"" << tu.p_name << "\"";
@@ -98,7 +98,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::test_unit_skipped( std::ostream& output, test_unit const& tu )
{
output << "Test " << tu.p_type_name << " \"" << tu.p_name << "\"" << "is skipped" << std::endl;
@@ -106,7 +106,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::log_exception( std::ostream& output, log_checkpoint_data const& checkpoint_data, const_string explanation )
{
print_prefix( output, BOOST_TEST_L( "unknown location" ), 0 );
@@ -131,7 +131,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::log_entry_start( std::ostream& output, log_entry_data const& entry_data, log_entry_types let )
{
switch( let ) {
@@ -158,7 +158,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::log_entry_value( std::ostream& output, const_string value )
{
output << value;
@@ -166,7 +166,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::log_entry_finish( std::ostream& output )
{
output << std::endl;
@@ -174,7 +174,7 @@
//____________________________________________________________________________//
-void
+EXPORT_C void
compiler_log_formatter::print_prefix( std::ostream& output, const_string file, std::size_t line )
{
output << file << '(' << line << "): ";
--- a/stdcpp/tsrc/Boost_test/test_framework/src/interaction_based.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/test_framework/src/interaction_based.cpp Mon May 03 14:06:43 2010 +0300
@@ -127,4 +127,4 @@
// ***************************************************************************
#ifndef __SYMBIAN32__
#endif // BOOST_TEST_INTERACTION_BASED_IPP_112105GER
-#endif
\ No newline at end of file
+#endif
--- a/stdcpp/tsrc/Boost_test/test_framework/src/results_reporter.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Boost_test/test_framework/src/results_reporter.cpp Mon May 03 14:06:43 2010 +0300
@@ -49,7 +49,7 @@
struct results_reporter_impl : test_tree_visitor {
// Constructor
- EXPORT_C results_reporter_impl()
+ results_reporter_impl()
: m_output( &std::cerr )
, m_stream_state_saver( new io_saver_type( std::cerr ) )
, m_report_level( CONFIRMATION_REPORT )
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/group/tiostreams.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/group/tiostreams.mmp Mon May 03 14:06:43 2010 +0300
@@ -45,17 +45,19 @@
OS_LAYER_STDCPP_SYSTEMINCLUDE
OS_LAYER_BOOST_SYSTEMINCLUDE
+
+
+LIBRARY libstdcpp.lib
LIBRARY euser.lib
-LIBRARY stiftestinterface.lib
-LIBRARY libstdcpp.lib
LIBRARY libc.lib
LIBRARY libpthread.lib
+LIBRARY stiftestinterface.lib
LANG SC
OPTION CW -wchar_t on
MACRO _WCHAR_T_DECLARED
-END
+//END
// End of File
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/src/tiostreams.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/src/tiostreams.cpp Mon May 03 14:06:43 2010 +0300
@@ -108,8 +108,12 @@
Ctiostreams* Ctiostreams::NewL(
CTestModuleIf& aTestModuleIf )
{
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Ctiostreams* self = new (ELeave) Ctiostreams( aTestModuleIf );
-
+
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/src/tiostreamsblocks.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tiostreams/src/tiostreamsblocks.cpp Mon May 03 14:06:43 2010 +0300
@@ -35,6 +35,7 @@
#include <iostream>
#include <fstream>
#include <stl/char_traits.h>
+#include <new>
#include<e32std.h>
#include<exception>
@@ -624,7 +625,7 @@
int length;
-char * buffer;
+//char * buffer;
char getl[8] ;
filebuf fb;
fb.open ("c:\\TestFramework\\docs\\istream.txt",ios::in);
@@ -891,7 +892,7 @@
//____________________
int arr[4] = { 3,4,7,8 };
- int total=0;
+// int total=0;
deque<int> d(arr+0, arr+4);
//
// stream the whole vector and a sum to cout
@@ -1051,9 +1052,9 @@
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
#endif
- char* s;
- int n;
- ios_base::openmode mode;
+// char* s;
+// int n;
+// ios_base::openmode mode;
// strstream ss3(s, n, mode);
strstream ss1,ss2;
ss1 << "";
@@ -1121,9 +1122,9 @@
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
#endif
- char* s;
- int n;
- ios_base::openmode mode;
+// char* s;
+// int n;
+// ios_base::openmode mode;
// ostrstream oss3( s, n, mode);
ostrstream oss1 ,oss2;
string str;
@@ -1318,23 +1319,23 @@
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
#endif
- signed char* get;
+ signed char* get = NULL;
streamsize n=10;
- signed char* put;
- unsigned char* uget;
- unsigned char* uput;
- const char* cget;
- const signed char* csget;
+ signed char* put = NULL;
+ unsigned char* uget = NULL;
+ unsigned char* uput = NULL;
+ const char* cget = NULL;
+ const signed char* csget = NULL;
- const unsigned char* cucget;
+ const unsigned char* cucget = NULL;
typedef void* (*__alloc_fn)(size_t);
typedef void (*__free_fn)(void*);
- __alloc_fn alloc_f;
+// __alloc_fn alloc_f;
- __free_fn free_f;
+// __free_fn free_f;
//overloaded
strstreambuf buf1(get, n,put);
@@ -1491,7 +1492,7 @@
{
- streamoff s;
+// streamoff s;
ifstream file( "c:\\TestFramework\\docs\\fpos_state.txt" );
cout<<"";
#if STDCPP_OOM
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/group/tlocale.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/group/tlocale.mmp Mon May 03 14:06:43 2010 +0300
@@ -52,7 +52,6 @@
LIBRARY euser.lib
LIBRARY libc.lib
LIBRARY libpthread.lib
-LIBRARY euser.lib
LIBRARY stiftestinterface.lib
LANG SC
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/src/tlocale.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/src/tlocale.cpp Mon May 03 14:06:43 2010 +0300
@@ -108,8 +108,12 @@
Ctlocale* Ctlocale::NewL(
CTestModuleIf& aTestModuleIf )
{
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Ctlocale* self = new (ELeave) Ctlocale( aTestModuleIf );
-
+
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/src/tlocaleblocks.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tlocale/src/tlocaleblocks.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,8 @@
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
#endif
- char* p = "c";
- const char* _Loc_ctype_default(p) ;
+// char* p = "c";
+// const char* _Loc_ctype_default(p) ;
locale loc("en_GB.UTF-8") ;
result = has_facet <ctype<char> > ( loc );
@@ -481,8 +481,8 @@
locale loc;
string buffer("$100.02");
string dest;
- long double ldest;
- ios_base::iostate state;
+// long double ldest;
+// ios_base::iostate state;
iter_type end;
cout<<"";
#if STDCPP_OOM
@@ -533,7 +533,7 @@
locale loc;
string buffer("10002");
- long double ldval = 10002;
+// long double ldval = 10002;
iter_type begin(cout);
cout<<"";
@@ -818,8 +818,8 @@
typedef std::istreambuf_iterator<char,
std::char_traits<char> > Iter;
- static struct tm timeb;
- std::ios_base::iostate state;
+// static struct tm timeb;
+// std::ios_base::iostate state;
cout<<"";
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
@@ -863,7 +863,7 @@
{
- std::tm t = std::tm ();
+/* std::tm t = std::tm ();
t.tm_sec = 56;
t.tm_min = 34;
@@ -884,7 +884,7 @@
"%X", "%y", "%Y", "%z", "%Z", "%%", "%Ec", "%EC", "%Ex",
"%EX", "%Ey", "%EY", "%Od", "%Oe", "%OH", "%OI", "%Om",
"%OM", "%OS", "%Ou", "%OU", "%OV", "%Ow", "%OW", "%Oy"
- };
+ };*/
cout<<"";
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
@@ -1482,23 +1482,23 @@
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
#endif
- char* p = "c";
- const char* _Loc_ctype_default(p);
+// char* p = "c";
+/* const char* _Loc_ctype_default(p);
const char* _Loc_numeric_default(p) ;
const char* _Loc_time_default(p) ;
const char* _Loc_collate_default(p) ;
const char* _Loc_monetary_default(p) ;
- const char* _Loc_messages_default(p) ;
+ const char* _Loc_messages_default(p) ;*/
- locale::category c;
+/* locale::category c;
//_Locale* L = "k";
const char* name1 = "catalog";
- const char* name2="test";
+ const char* name2="test";*/
const locale& L1= 0;
const locale& L2= 0;
- const char* name = "testing";
+// const char* name = "testing";
// void _Stl_loc_combine_names(L,name1,name2,c);
//locale::locale(const locale& L1, const locale& L2, category c)
//locale::category c;
@@ -1564,7 +1564,7 @@
locale loc1 ( "C" );
char *string = "Hello, my name is John!";
- wchar_t *wstring = L"Hello, my name is John!";
+// wchar_t *wstring = L"Hello, my name is John!";
const char* i = use_facet<ctype<char> > ( loc1 ).scan_is ( ctype_base::punct, &string[0], &string[strlen(&string[0])-1] );
// const wchar_t* wi = use_facet<ctype<wchar_t> > ( loc1 ).scan_is ( ctype_base::punct, &wstring[0], &wstring[strlen(&wstring[0])-1] );
@@ -1602,7 +1602,7 @@
char str2[16];
-char test;
+//char test;
use_facet<ctype<char> > ( loc1 ).toupper( &string3[0], &string3[strlen(&string3[0])] );
use_facet<ctype<wchar_t> > ( loc1 ).toupper( &wstring3[0], &wstring3[27] );
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_1/src/tstl_1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_1/src/tstl_1.cpp Mon May 03 14:06:43 2010 +0300
@@ -108,8 +108,12 @@
Ctstl_1* Ctstl_1::NewL(
CTestModuleIf& aTestModuleIf )
{
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Ctstl_1* self = new (ELeave) Ctstl_1( aTestModuleIf );
-
+
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_1/src/tstl_1blocks.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_1/src/tstl_1blocks.cpp Mon May 03 14:06:43 2010 +0300
@@ -467,7 +467,7 @@
int result_int1;
int result_int2;
char result_char;
- float result_float;
+// float result_float;
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
@@ -614,7 +614,7 @@
#endif
test_variable1 = *max_element(test_array1,test_array1 + 8);
test_variable2 = *max_element(test_array2,test_array2+5);
- int test_variable3 =*max_element(test_array1,test_array1 + 10);
+ int test_variable3 =*max_element(test_array1,test_array1 + 7);
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::ENone,1);
@@ -1042,7 +1042,7 @@
int array1[10];
int array2[10];
list <int> L1;
- list <int>::iterator LIter1, LIterend, LIterend2;
+// list <int>::iterator LIter1, LIterend, LIterend2;
int t;
for ( t = 1 ; t <= 10 ; t++ )
@@ -1201,7 +1201,7 @@
10,20,30,40,50,60,70
};
vector<int> myvector (myints,myints+8) ,myvector1(myints1,myints1+7);
- vector<int>::iterator it,it2; // cout<<"";
+ vector<int>::iterator it; // cout<<"";
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
@@ -2252,20 +2252,21 @@
vector <int> v1(array1,array1+12), v2(array2,array2+3),v3(array3,array3+4);
vector<int> v4(array4,array4+4);
- vector <int>::iterator Iter1, Iter2,Iter3 ,Iter4;
-
-
-
-
-
- vector <int>::iterator result1,result2; // cout<<"";
+// vector <int>::iterator Iter1, Iter2,Iter3 ,Iter4;
+
+
+
+
+ vector <int>::iterator result1;
+
+
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
#endif
result1 = find_end( v1.begin( ), v1.end( ), v3.begin( ), v3.end( ) );
- result2 = find_end ( v1.begin( ), v1.end( ), v4.begin( ), v4.end( ) );
+// result2 = find_end ( v1.begin( ), v1.end( ), v4.begin( ), v4.end( ) );
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::ENone,1);
@@ -2321,7 +2322,7 @@
vector <int> v1(array1,array1+12), v2(array2,array2+3),v3(array3,array3+4);
vector<int> v4(array4,array4+4);
- vector <int>::iterator Iter1, Iter2,Iter3 ,Iter4;
+// vector <int>::iterator Iter1, Iter2,Iter3 ,Iter4;
@@ -3018,9 +3019,13 @@
//vector containing numbers
IntVector Numbers(MAX_ELEMENTS), Result(MAX_ELEMENTS) ;
-
+
+#ifdef __ARMCC__
+#pragma diag_suppress 550
+#endif
IntVectorIt start, end, it, last, resultIt ;
+
//Initialize vector Numbers
Numbers[0] = 10 ;
Numbers[1] = 20 ;
@@ -3281,7 +3286,7 @@
//vector containing numbers
IntVector Numbers(MAX_ELEMENTS) ;
- IntVectorIt start, end, it, last, resultIt ;
+ IntVectorIt start, end, it ;
//Initialize vector Numbers
Numbers[0] = 10 ;
@@ -4319,10 +4324,10 @@
try
{ // __UHEAP_MARK;
- int failures =0,k,l;
+ int failures =0;
vector <int> v1;
- vector <int>::iterator Iter1;
- pair < vector <int> :: iterator , vector <int> :: iterator > Result1, Result2, Result3;
+// vector <int>::iterator Iter1;
+ pair < vector <int> :: iterator , vector <int> :: iterator > Result1, Result2;
// Constructing vectors v1a & v1b with default less than ordering
int i;
@@ -4342,7 +4347,7 @@
// Constructing vectors v2 with range sorted by greater
vector <int> v2 ( v1 );
- vector <int>::iterator Iter2;
+// vector <int>::iterator Iter2;
sort ( v2.begin ( ) , v2.end ( ) , greater<int> ( ) );
// cout<<"";
@@ -4475,7 +4480,7 @@
IntVector Numbers(VECTOR_SIZE) ; //vector containing numbers
- IntVectorIt start, end, it ;
+// IntVectorIt start, end, it ;
int i ;
@@ -4535,7 +4540,7 @@
try
{
- size_t startVAR,strideVAR,sizeVAR;
+ size_t startVAR;
valarray<int> va ( 20 ), vaResult;
@@ -4722,7 +4727,7 @@
try
{
vector<int> v1;
-vector<int>::iterator Iter;
+//vector<int>::iterator Iter;
int i ;
for (i = 0; i <= 5; i++)
{
@@ -4965,7 +4970,7 @@
int Array[] = { 10, 20, 30, 40 };
const int N = sizeof( Array ) / sizeof( int );
- int i;
+// int i;
Integer2* ArrayPtr = ( Integer2* ) malloc( N * sizeof( int ) );
@@ -5164,7 +5169,7 @@
try
{
vector <int> v1;
- vector <int>::iterator Iter1, Iter2;
+ vector <int>::iterator Iter1;
int i,failures = 0 ;
static int j ,k;
for ( i = 1 ; i <= 3 ; i++ )
@@ -5558,7 +5563,7 @@
failures++;
- float l = 31.31234F;
+// float l = 31.31234F;
cout.precision( 3 );
@@ -5761,4 +5766,4 @@
- //end of file
\ No newline at end of file
+ //end of file
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_2/src/tstl_2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_2/src/tstl_2.cpp Mon May 03 14:06:43 2010 +0300
@@ -108,8 +108,12 @@
Ctstl_2* Ctstl_2::NewL(
CTestModuleIf& aTestModuleIf )
{
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Ctstl_2* self = new (ELeave) Ctstl_2( aTestModuleIf );
-
+
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_2/src/tstl_2blocks.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_2/src/tstl_2blocks.cpp Mon May 03 14:06:43 2010 +0300
@@ -46,6 +46,14 @@
#undef test
using namespace std;
#define STDCPP_OOM FALSE// TRUE for OOM testing
+
+#ifdef __ARMCC__
+#pragma diag_suppress 550
+#pragma diag_suppress 177
+#pragma diag_suppress 1134
+#pragma diag_suppress 1250
+#endif
+
// ============================ MEMBER FUNCTIONS ===============================
// -----------------------------------------------------------------------------
@@ -491,7 +499,7 @@
// vector <int>::iterator vIter;
- vector <int>::reverse_iterator rvIter;
+// vector <int>::reverse_iterator rvIter;
vector <int>::iterator pos;
@@ -551,7 +559,7 @@
}
- list <int>::iterator L_Iter, LPOS = L.begin ( );
+ list <int>::iterator LPOS = L.begin ( );
@@ -732,8 +740,7 @@
string s1;
- s1 = str.template to_string<char,
- char_traits<char>, allocator<char> >( );
+ s1 = str.template to_string<char, char_traits<char>, allocator<char> >( );
if(s1.compare("00111"))
@@ -2676,7 +2683,7 @@
int sum =1;
int i=2 ;
list <int> L1;
- list <int>::iterator LIter1, LIterend;
+// list <int>::iterator LIter1, LIterend;
int t;
for ( t = 1 ; t <= 10 ; t++ )
@@ -3047,8 +3054,8 @@
vector <int> v1, v2;
list <int> L1;
- vector <int>::iterator Iter1, Iter2;
- list <int>::iterator L1_Iter, L1_inIter;
+// vector <int>::iterator Iter1, Iter2;
+// list <int>::iterator L1_Iter, L1_inIter;
int i;
for ( i = 0 ; i <= 5 ; i++ )
@@ -3541,7 +3548,7 @@
// __UHEAP_MARK;
try{
vector <int> v1;
- vector <int>::iterator v1Iter;
+// vector <int>::iterator v1Iter;
vector <int>:: allocator_type v1Alloc;
int i;
@@ -3821,7 +3828,7 @@
try{
vector <int> v1;
- vector <int>::iterator v1Iter;
+// vector <int>::iterator v1Iter;
vector <int>:: allocator_type v1Alloc;
@@ -3879,7 +3886,7 @@
- double pi = 3.14159265359;
+// double pi = 3.14159265359;
// cout<<"";
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/group/tstl_3.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/group/tstl_3.mmp Mon May 03 14:06:43 2010 +0300
@@ -61,7 +61,7 @@
OPTION CW -wchar_t on
MACRO _WCHAR_T_DECLARED
-END
+//END
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/src/tstl_3.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/src/tstl_3.cpp Mon May 03 14:06:43 2010 +0300
@@ -108,8 +108,12 @@
Ctstl_3* Ctstl_3::NewL(
CTestModuleIf& aTestModuleIf )
{
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Ctstl_3* self = new (ELeave) Ctstl_3( aTestModuleIf );
-
+
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/src/tstl_3blocks.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_3/src/tstl_3blocks.cpp Mon May 03 14:06:43 2010 +0300
@@ -744,7 +744,7 @@
//__UHEAP_MARK;
- int failures=0,i=0;
+ int failures=0;
try
{
@@ -1332,7 +1332,7 @@
int sum =1;
int i=2 ;
list <int> L1;
- list <int>::iterator LIter1, LIterend;
+// list <int>::iterator LIter1, LIterend;
int t;
for ( t = 1 ; t <= 10 ; t++ )
@@ -1499,7 +1499,7 @@
/*
if(output[0]==26500)
- if(output[1]==19169)
+ if(output[1]==19169)
if(output[2]== 18467)
if(output[3]== 6334)
if(output[4]== 6262)
@@ -1556,11 +1556,13 @@
int failures=0;
//__UHEAP_MARK;
try{
+
// Create an array of ints
- int intArray [ ] = { 10, 20, 30, 40, 100, 200, 300, 1000, 2000 };
- int count = sizeof ( intArray ) / sizeof ( int );
-
+ // int intArray [ ] = { 10, 20, 30, 40, 100, 200, 300, 1000, 2000 };
+
+ int count = 9; //sizeof ( intArray ) / sizeof ( int );
+
pair<int *, ptrdiff_t> resultPair;
// cout<<"";
#if STDCPP_OOM
@@ -1703,8 +1705,8 @@
vector <int> v1, v2;
list <int> L1;
- vector <int>::iterator Iter1, Iter2;
- list <int>::iterator L1_Iter, L1_inIter;
+// vector <int>::iterator Iter1, Iter2;
+// list <int>::iterator L1_Iter, L1_inIter;
int i;
for ( i = 0 ; i <= 5 ; i++ )
@@ -2197,7 +2199,7 @@
// __UHEAP_MARK;
try{
vector <int> v1;
- vector <int>::iterator v1Iter;
+// vector <int>::iterator v1Iter;
vector <int>:: allocator_type v1Alloc;
int i;
@@ -2477,7 +2479,7 @@
try{
vector <int> v1;
- vector <int>::iterator v1Iter;
+// vector <int>::iterator v1Iter;
vector <int>:: allocator_type v1Alloc;
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_4/src/tstl_4.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_4/src/tstl_4.cpp Mon May 03 14:06:43 2010 +0300
@@ -108,8 +108,12 @@
Ctstl_4* Ctstl_4::NewL(
CTestModuleIf& aTestModuleIf )
{
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Ctstl_4* self = new (ELeave) Ctstl_4( aTestModuleIf );
-
+
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_4/src/tstl_4Blocks.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/tstl_4/src/tstl_4Blocks.cpp Mon May 03 14:06:43 2010 +0300
@@ -365,7 +365,7 @@
int array1[10];
int array2[10];
list <int> L1;
- list <int>::iterator LIter1, LIterend, LIterend2;
+// list <int>::iterator LIter1, LIterend, LIterend2;
int t;
for ( t = 1 ; t <= 10 ; t++ )
@@ -524,7 +524,7 @@
10,20,30,40,50,60,70
};
vector<int> myvector (myints,myints+8) ,myvector1(myints1,myints1+7);
-vector<int>::iterator it,it2;
+vector<int>::iterator it;
//cout<<"";
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
@@ -1581,13 +1581,12 @@
vector <int> v1(array1,array1+12), v2(array2,array2+3),v3(array3,array3+4);
vector<int> v4(array4,array4+4);
- vector <int>::iterator Iter1, Iter2,Iter3 ,Iter4;
-
-
-
-
-
- vector <int>::iterator result1,result2;
+// vector <int>::iterator Iter1, Iter2,Iter3 ,Iter4;
+
+
+vector <int>::iterator result1;
+
+
//cout<<"";
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
@@ -1595,7 +1594,7 @@
#endif
result1 = find_end( v1.begin( ), v1.end( ), v3.begin( ), v3.end( ) );
- result2 = find_end ( v1.begin( ), v1.end( ), v4.begin( ), v4.end( ) );
+// result2 = find_end ( v1.begin( ), v1.end( ), v4.begin( ), v4.end( ) );
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::ENone,1);
@@ -1729,7 +1728,7 @@
#endif
test_variable1 = *max_element(test_array1,test_array1 + 8);
test_variable2 = *max_element(test_array2,test_array2+5);
-int test_variable3 =*max_element(test_array1,test_array1 + 10);
+int test_variable3 =*max_element(test_array1,test_array1 + 7);
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::ENone,1);
@@ -2150,7 +2149,7 @@
int result_int1;
int result_int2;
char result_char;
- float result_float;
+// float result_float;
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
@@ -2527,7 +2526,7 @@
// vector <int>::iterator vIter;
- vector <int>::reverse_iterator rvIter;
+// vector <int>::reverse_iterator rvIter;
vector <int>::iterator pos;
@@ -2587,7 +2586,7 @@
}
- list <int>::iterator L_Iter, LPOS = L.begin ( );
+ list <int>::iterator LPOS = L.begin ( );
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/group/twiostreams.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/group/twiostreams.mmp Mon May 03 14:06:43 2010 +0300
@@ -61,7 +61,7 @@
OPTION CW -wchar_t on
MACRO _WCHAR_T_DECLARED
-END
+//END
// End of File
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/src/twiostreams.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/src/twiostreams.cpp Mon May 03 14:06:43 2010 +0300
@@ -108,8 +108,12 @@
Ctwiostreams* Ctwiostreams::NewL(
CTestModuleIf& aTestModuleIf )
{
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Ctwiostreams* self = new (ELeave) Ctwiostreams( aTestModuleIf );
-
+
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/src/twiostreamsblocks.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/bcdrivers/twiostreams/src/twiostreamsblocks.cpp Mon May 03 14:06:43 2010 +0300
@@ -139,7 +139,7 @@
string str5a ( "Hello World");
- basic_string <char>::iterator strp_Iter, str1_Iter, str2_Iter;
+ basic_string <char>::iterator strp_Iter;
@@ -207,7 +207,7 @@
char* wszHello = "Hello World";
- char wBuffer[128];
+// char wBuffer[128];
cout<<"";
#if STDCPP_OOM
User::__DbgSetAllocFail(FALSE,RHeap::EDeterministic,1);
@@ -281,7 +281,7 @@
typedef std::basic_ofstream<Input::char_type, Input::traits_type> Output;
- Input::char_type s [200];
+// Input::char_type s [200];
Output out ("c:\\TestFramework\\docs\\basicistream.txt", std::ios::in | std::ios::out | std::ios::trunc);
@@ -465,7 +465,7 @@
int length;
-wchar_t * buffer;
+//wchar_t * buffer;
wchar_t getl[16] ;
wfilebuf fb;
@@ -649,7 +649,7 @@
int output[5];
- int n,val;
+ int n = 0,val = 0;
wstring strvalues ;
strvalues = L"1 2 3 4 5";
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/include/rw/_exception.h Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/include/rw/_exception.h Mon May 03 14:06:43 2010 +0300
@@ -83,24 +83,24 @@
{
public:
- _RWSTD_EXPORT __rw_exception () _THROWS (());
+ IMPORT_C __rw_exception () _THROWS (());
- _RWSTD_EXPORT __rw_exception (const __rw_exception&);
+ IMPORT_C __rw_exception (const __rw_exception&);
- _RWSTD_EXPORT _EXPLICIT __rw_exception (const _STD::string&);
+ IMPORT_C _EXPLICIT __rw_exception (const _STD::string&);
- _RWSTD_EXPORT _EXPLICIT __rw_exception (const char*);
+ IMPORT_C _EXPLICIT __rw_exception (const char*);
- _RWSTD_EXPORT virtual ~__rw_exception () _THROWS (());
+ IMPORT_C virtual ~__rw_exception () _THROWS (());
// empty exception specification necessary in order to preserve
// the no-exception guarantee provided by std::exception to
// derived classes (e.g., logic_error)
-_RWSTD_EXPORT __rw_exception& operator= (const __rw_exception&) _THROWS (());
+IMPORT_C __rw_exception& operator= (const __rw_exception&) _THROWS (());
- _RWSTD_EXPORT virtual const char* what () const _THROWS (());
+ IMPORT_C virtual const char* what () const _THROWS (());
- _RWSTD_EXPORT __rw_exception& _C_assign (const char*, _RWSTD_SIZE_T /*= _RWSTD_SIZE_MAX*/);
+ IMPORT_C __rw_exception& _C_assign (const char*, _RWSTD_SIZE_T /*= _RWSTD_SIZE_MAX*/);
private:
char *_C_what; // description string
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/_exception.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/_exception.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,6 +20,10 @@
#include <rw/_defs.h>
#include<rw/_exception.h>
+#ifdef __ARMCC__
+#pragma diag_suppress 940
+#endif
+
_RWSTD_EXPORT __rw::__rw_exception::__rw_exception () _THROWS (()){}
_RWSTD_EXPORT __rw::__rw_exception::__rw_exception (const __rw_exception& x){}
@@ -34,4 +38,4 @@
_RWSTD_EXPORT __rw::__rw_exception& __rw::__rw_exception::operator= (const __rw_exception& x) _THROWS (()){}
- _RWSTD_EXPORT __rw::__rw_exception& __rw::__rw_exception::_C_assign (const char* , _RWSTD_SIZE_T/*= _RWSTD_SIZE_MAX*/){}
\ No newline at end of file
+ _RWSTD_EXPORT __rw::__rw_exception& __rw::__rw_exception::_C_assign (const char* , _RWSTD_SIZE_T/*= _RWSTD_SIZE_MAX*/){}
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/cmdopt.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/cmdopt.cpp Mon May 03 14:06:43 2010 +0300
@@ -29,6 +29,11 @@
#include <stdlib.h> // for atexit, free, malloc
#include <string.h> // for memcpy, strcpy, strcmp, ...
+#ifdef __ARMCC__
+#pragma diag_suppress 61
+#pragma diag_suppress 63
+#endif
+
#ifndef EINVAL
# define EINVAL 22 /* e.g., HP-UX, Linux, Solaris */
#endif // EINVAL
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/driver.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/driver.cpp Mon May 03 14:06:43 2010 +0300
@@ -44,7 +44,7 @@
// declare fileno in case it's not declared (for strict ANSI conformance)
extern "C" {
-_RWSTD_DLLIMPORT int (fileno)(FILE*) _LIBC_THROWS ();
+IMPORT_C int (fileno)(FILE*) _LIBC_THROWS ();
} // extern "C"
@@ -860,10 +860,15 @@
// count the number of embedded quotes
char *quote = buf;
size_t nquotes = 0;
+
+ #ifdef __ARMCC__
+ #pragma diag_suppress 1293
+ #endif
while ((quote = strchr (quote, '"'))) {
++nquotes;
++quote;
}
+
// no quotes found, return the original buffer
if (0 == nquotes)
@@ -949,8 +954,13 @@
// compute the number of newline characters in the text
int nlines = 0;
+
+ #ifdef __ARMCC__
+ #pragma diag_suppress 1293
+ #endif
for (const char *nl = usrbuf; (nl = strchr (nl, '\n')); ++nl)
++nlines;
+
static const int use_color = _rw_use_color ();
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/environ.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/environ.cpp Mon May 03 14:06:43 2010 +0300
@@ -33,7 +33,7 @@
#ifndef _RWSTD_NO_PUTENV_CONST_CHAR
-_RWSTD_DLLIMPORT int putenv (const char*) _LIBC_THROWS ();
+IMPORT_C int putenv (const char*) _LIBC_THROWS ();
#else // if defined (_RWSTD_NO_PUTENV_CONST_CHAR)
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/file.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/file.cpp Mon May 03 14:06:43 2010 +0300
@@ -61,7 +61,7 @@
#ifndef _RWSTD_NO_PURE_C_HEADERS
-extern "C" int mkstemp (char*);
+IMPORT_C int mkstemp (char*);
#endif // _RWSTD_NO_PURE_C_HEADERS
@@ -290,9 +290,13 @@
#ifdef __SYMBIAN32__
struct stat sb;
-
+
+ #ifdef __ARMCC__
+ #pragma diag_suppress 63
+ #endif
if (-1 == stat (fname, &sb))
return _RWSTD_SIZE_MAX;
+
return sb.st_size;
#elif defined (_WIN32) || defined (_WIN64)
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/opt_lines.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/opt_lines.cpp Mon May 03 14:06:43 2010 +0300
@@ -155,6 +155,10 @@
else if ('-' == *end) {
first = line;
while (' ' == *++end);
+
+ #ifdef __ARMCC__
+ #pragma diag_suppress 61
+ #endif
if ('\0' == *end) {
line = _RWSTD_INT_MAX;
}
@@ -164,6 +168,7 @@
}
else
line = -1;
+
}
else if ('\0' == *end) {
first = line++;
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/printf.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/printf.cpp Mon May 03 14:06:43 2010 +0300
@@ -53,6 +53,11 @@
//#include <string>
#include <string.h>
+#ifdef __ARMCC__
+#pragma diag_suppress 61
+#pragma diag_suppress 63
+#endif
+
#define _RWSTD_NO_EXT_BIN_IO
#define _RWSTD_NO_EXT_REENTRANT_IO
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/valcmp.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/testengine/src/valcmp.cpp Mon May 03 14:06:43 2010 +0300
@@ -711,7 +711,11 @@
{
#if _RWSTD_SHRT_SIZE == _RWSTD_INT_SIZE
typedef short IntT;
+ #ifdef __ARMCC__
+ #pragma diag_suppress 68
+ #endif
const IntT imin = _RWSTD_SHRT_MIN;
+
#elif _RWSTD_FLT_SIZE == _RWSTD_INT_SIZE
typedef int IntT;
const IntT imin = _RWSTD_INT_MIN;
@@ -812,8 +816,13 @@
if (sizeof (long double) == sizeof (double))
return rw_dblcmp (double (x), double (y));
+ #ifdef __ARMCC__
+ #pragma diag_suppress 111
+ #endif
if (x == y)
return 0;
+
+
// FIXME: use integer math as in the functions above
@@ -917,6 +926,3 @@
#endif
-
-
-
\ No newline at end of file
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/algorithms/src/25.fill.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/algorithms/src/25.fill.cpp Mon May 03 14:06:43 2010 +0300
@@ -71,7 +71,7 @@
std::fill (begin, end, *new_t);
// verify 25.2.5, p2
- bool success;
+ bool success = true;
std::size_t j = 0;
for ( ; j != i + 1; ++j) {
success = buf[j].val_ == new_t->val_;
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/algorithms/src/25.generate.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/algorithms/src/25.generate.cpp Mon May 03 14:06:43 2010 +0300
@@ -76,11 +76,11 @@
// Size must be convertible to an integral type
operator int () const { return val_; }
- operator++()
+ int operator++()
{
return ++val_;
}
- operator--()
+ int operator--()
{
return --val_;
}
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/localization/src/22.locale.money.put.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/localization/src/22.locale.money.put.cpp Mon May 03 14:06:43 2010 +0300
@@ -318,7 +318,11 @@
Ios<charT> ios;
// money_put-derived object
+ #ifdef __ARMCC__
+ #pragma diag_suppress 811
+ #endif
const MoneyPut<charT> mp;
+
// install the moneypunct facet in a locale and imbue the latter
// in the ios-derived object used by money_put
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/localization/src/22.locale.num.get.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/localization/src/22.locale.num.get.cpp Mon May 03 14:06:43 2010 +0300
@@ -82,6 +82,12 @@
#define LOG_FILENAME_LINE __FILE__, __LINE__
int failures=0;
+#ifdef __ARMCC__
+#pragma diag_suppress 940
+#pragma diag_suppress 815
+#pragma diag_suppress 177
+#endif
+
#ifdef __SYMBIAN32__
#include<assert.h>
#endif //__SYMBIAN32__
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/localization/src/22.locale.num.put.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/localization/src/22.locale.num.put.cpp Mon May 03 14:06:43 2010 +0300
@@ -51,6 +51,12 @@
#define LOG_FILENAME_LINE __FILE__, __LINE__
int failures=0;
+
+#ifdef __ARMCC__
+#pragma diag_suppress 61
+#pragma diag_suppress 236
+#endif
+
/**************************************************************************/
//#if 0
// set by the command line option handler in response to:
@@ -3429,8 +3435,13 @@
ios.flags (std::ios_base::fmtflags ());
+
#define Abs(i) ((i) < 0 ? (-i) : (i))
+#ifdef __ARMCC__
+#pragma diag_suppress 47
+#endif
+
#define ASSERT(T, N, T2, tname, t2name) \
do { \
/* number of expected calls to the do_put() member */ \
--- a/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/tr1.util/src/2.smartptr.shared.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stdcxx/tstapps/tr1.util/src/2.smartptr.shared.cpp Mon May 03 14:06:43 2010 +0300
@@ -1826,6 +1826,6 @@
close_log_file();
return failures;
#endif
- return 0;
+// return 0;
}
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_accum/src/stlport_accum.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_accum/src/stlport_accum.cpp Mon May 03 14:06:43 2010 +0300
@@ -115,8 +115,12 @@
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_accum* self = new (ELeave) Cstlport_accum( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_adjdiff/src/stlport_adjdiff.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_adjdiff/src/stlport_adjdiff.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,12 +113,17 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
- Cstlport_adjdiff* self = new (ELeave) Cstlport_adjdiff( aTestModuleIf );
+
+#ifdef __ARMCC__
+ #pragma diag_suppress 830
+#endif
+ Cstlport_adjdiff* self = new (ELeave) Cstlport_adjdiff( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
-
+
return self;
}
@@ -134,7 +139,6 @@
// Delete logger
delete iLog;
-
}
// ========================== OTHER EXPORTED FUNCTIONS =========================
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_adjfind/src/stlport_adjfind.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_adjfind/src/stlport_adjfind.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_adjfind* self = new (ELeave) Cstlport_adjfind( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_advance/src/stlport_advance.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_advance/src/stlport_advance.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_advance* self = new (ELeave) Cstlport_advance( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_alg/src/stlport_alg.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_alg/src/stlport_alg.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_alg* self = new (ELeave) Cstlport_alg( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bcompos/src/stlport_bcompos.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bcompos/src/stlport_bcompos.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_bcompos* self = new (ELeave) Cstlport_bcompos( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bind/src/stlport_bind.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bind/src/stlport_bind.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_bind* self = new (ELeave) Cstlport_bind( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_binsert/src/stlport_binsert.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_binsert/src/stlport_binsert.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_binsert* self = new (ELeave) Cstlport_binsert( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_binsrch/src/stlport_binsrch.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_binsrch/src/stlport_binsrch.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_binsrch* self = new (ELeave) Cstlport_binsrch( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bitset/src/stlport_bitset.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bitset/src/stlport_bitset.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_bitset* self = new (ELeave) Cstlport_bitset( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bnegate/src/stlport_bnegate.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bnegate/src/stlport_bnegate.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_bnegate* self = new (ELeave) Cstlport_bnegate( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bvec/src/stlport_bvec.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_bvec/src/stlport_bvec.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_bvec* self = new (ELeave) Cstlport_bvec( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_c_test/src/stlport_c_test.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_c_test/src/stlport_c_test.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_c_test* self = new (ELeave) Cstlport_c_test( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_copy/src/stlport_copy.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_copy/src/stlport_copy.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_copy* self = new (ELeave) Cstlport_copy( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_count/src/stlport_count.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_count/src/stlport_count.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_count* self = new (ELeave) Cstlport_count( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_deque/src/stlport_deque.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_deque/src/stlport_deque.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_deque* self = new (ELeave) Cstlport_deque( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_divides/src/stlport_divides.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_divides/src/stlport_divides.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_divides* self = new (ELeave) Cstlport_divides( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_equal/src/stlport_equal.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_equal/src/stlport_equal.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_equal* self = new (ELeave) Cstlport_equal( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_fill/src/stlport_fill.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_fill/src/stlport_fill.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_fill* self = new (ELeave) Cstlport_fill( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_find/src/stlport_find.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_find/src/stlport_find.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_find* self = new (ELeave) Cstlport_find( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_finsert/src/stlport_finsert.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_finsert/src/stlport_finsert.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_finsert* self = new (ELeave) Cstlport_finsert( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_foreach/src/stlport_foreach.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_foreach/src/stlport_foreach.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_foreach* self = new (ELeave) Cstlport_foreach( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_fstream/src/stlport_fstream.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_fstream/src/stlport_fstream.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,6 +113,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_fstream* self = new (ELeave) Cstlport_fstream( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_func/src/stlport_func.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_func/src/stlport_func.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_func* self = new (ELeave) Cstlport_func( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_gener/src/stlport_gener.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_gener/src/stlport_gener.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_gener* self = new (ELeave) Cstlport_gener( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_great/src/stlport_great.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_great/src/stlport_great.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_great* self = new (ELeave) Cstlport_great( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_hmap/src/stlport_hmap.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_hmap/src/stlport_hmap.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_hmap* self = new (ELeave) Cstlport_hmap( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_hset/src/stlport_hset.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_hset/src/stlport_hset.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_hset* self = new (ELeave) Cstlport_hset( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_incl/src/stlport_incl.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_incl/src/stlport_incl.cpp Mon May 03 14:06:43 2010 +0300
@@ -116,8 +116,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_incl* self = new (ELeave) Cstlport_incl( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_inplmrg/src/stlport_inplmrg.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_inplmrg/src/stlport_inplmrg.cpp Mon May 03 14:06:43 2010 +0300
@@ -114,6 +114,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_inplmrg* self = new (ELeave) Cstlport_inplmrg( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_inrprod/src/stlport_inrprod.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_inrprod/src/stlport_inrprod.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_inrprod* self = new (ELeave) Cstlport_inrprod( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_insert/src/stlport_insert.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_insert/src/stlport_insert.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_insert* self = new (ELeave) Cstlport_insert( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_iota/src/stlport_iota.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_iota/src/stlport_iota.cpp Mon May 03 14:06:43 2010 +0300
@@ -114,6 +114,9 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_iota* self = new (ELeave) Cstlport_iota( aTestModuleIf );
CleanupStack::PushL( self );
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_iter/src/stlport_iter.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_iter/src/stlport_iter.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_iter* self = new (ELeave) Cstlport_iter( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_iterswp/src/stlport_iterswp.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_iterswp/src/stlport_iterswp.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_iterswp* self = new (ELeave) Cstlport_iterswp( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_less/src/stlport_less.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_less/src/stlport_less.cpp Mon May 03 14:06:43 2010 +0300
@@ -114,8 +114,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_less* self = new (ELeave) Cstlport_less( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_lexcmp/src/stlport_lexcmp.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_lexcmp/src/stlport_lexcmp.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_lexcmp* self = new (ELeave) Cstlport_lexcmp( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_list/src/stlport_list.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_list/src/stlport_list.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_list* self = new (ELeave) Cstlport_list( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_logic/src/stlport_logic.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_logic/src/stlport_logic.cpp Mon May 03 14:06:43 2010 +0300
@@ -114,8 +114,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_logic* self = new (ELeave) Cstlport_logic( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_lwrbnd/src/stlport_lwrbnd.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_lwrbnd/src/stlport_lwrbnd.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_lwrbnd* self = new (ELeave) Cstlport_lwrbnd( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_map/src/stlport_map.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_map/src/stlport_map.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_map* self = new (ELeave) Cstlport_map( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_max/src/stlport_max.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_max/src/stlport_max.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_max* self = new (ELeave) Cstlport_max( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_memfunptr/src/memfunptr.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_memfunptr/src/memfunptr.cpp Mon May 03 14:06:43 2010 +0300
@@ -169,4 +169,4 @@
#ifdef _STLP_DONT_TEST_RETURN_VOID
#undef _STLP_DONT_TEST_RETURN_VOID
-#endif
\ No newline at end of file
+#endif
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_memfunptr/src/stlport_memfunptr.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_memfunptr/src/stlport_memfunptr.cpp Mon May 03 14:06:43 2010 +0300
@@ -108,8 +108,12 @@
Cstlport_memfunptr* Cstlport_memfunptr::NewL(
CTestModuleIf& aTestModuleIf )
{
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_memfunptr* self = new (ELeave) Cstlport_memfunptr( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_merge/src/stlport_merge.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_merge/src/stlport_merge.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_merge* self = new (ELeave) Cstlport_merge( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_min/src/stlport_min.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_min/src/stlport_min.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_min* self = new (ELeave) Cstlport_min( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_minus/src/stlport_minus.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_minus/src/stlport_minus.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_minus* self = new (ELeave) Cstlport_minus( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_mismtch/src/stlport_mismtch.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_mismtch/src/stlport_mismtch.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_mismtch* self = new (ELeave) Cstlport_mismtch( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_mkheap/src/stlport_mkheap.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_mkheap/src/stlport_mkheap.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_mkheap* self = new (ELeave) Cstlport_mkheap( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_mmap/src/stlport_mmap.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_mmap/src/stlport_mmap.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_mmap* self = new (ELeave) Cstlport_mmap( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_modulus/src/stlport_modulus.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_modulus/src/stlport_modulus.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_modulus* self = new (ELeave) Cstlport_modulus( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_mset/src/stlport_mset.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_mset/src/stlport_mset.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_mset* self = new (ELeave) Cstlport_mset( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_negate/src/stlport_negate.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_negate/src/stlport_negate.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_negate* self = new (ELeave) Cstlport_negate( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_nequal/src/stlport_nequal.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_nequal/src/stlport_nequal.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_nequal* self = new (ELeave) Cstlport_nequal( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_nextprm/src/stlport_nextprm.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_nextprm/src/stlport_nextprm.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_nextprm* self = new (ELeave) Cstlport_nextprm( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_nthelem/src/stlport_nthelem.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_nthelem/src/stlport_nthelem.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_nthelem* self = new (ELeave) Cstlport_nthelem( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ostmit/src/stlport_ostmit.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ostmit/src/stlport_ostmit.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_ostmit* self = new (ELeave) Cstlport_ostmit( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_parsrt/src/stlport_parsrt.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_parsrt/src/stlport_parsrt.cpp Mon May 03 14:06:43 2010 +0300
@@ -115,8 +115,12 @@
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_parsrt* self = new (ELeave) Cstlport_parsrt( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_parsrtc/src/stlport_parsrtc.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_parsrtc/src/stlport_parsrtc.cpp Mon May 03 14:06:43 2010 +0300
@@ -115,9 +115,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
-
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_parsrtc* self = new (ELeave) Cstlport_parsrtc( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_partsrt/src/stlport_partsrt.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_partsrt/src/stlport_partsrt.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_partsrt* self = new (ELeave) Cstlport_partsrt( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_partsum/src/stlport_partsum.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_partsum/src/stlport_partsum.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_partsum* self = new (ELeave) Cstlport_partsum( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_pheap/src/stlport_pheap.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_pheap/src/stlport_pheap.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_pheap* self = new (ELeave) Cstlport_pheap( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_plus/src/stlport_plus.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_plus/src/stlport_plus.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_plus* self = new (ELeave) Cstlport_plus( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_pqueue/src/stlport_pqueue.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_pqueue/src/stlport_pqueue.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_pqueue* self = new (ELeave) Cstlport_pqueue( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_prevprm/src/stlport_prevprm.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_prevprm/src/stlport_prevprm.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_prevprm* self = new (ELeave) Cstlport_prevprm( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ptition/src/stlport_ptition.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ptition/src/stlport_ptition.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_ptition* self = new (ELeave) Cstlport_ptition( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ptrbinf/src/stlport_ptrbinf.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ptrbinf/src/stlport_ptrbinf.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_ptrbinf* self = new (ELeave) Cstlport_ptrbinf( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ptrunf/src/stlport_ptrunf.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ptrunf/src/stlport_ptrunf.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_ptrunf* self = new (ELeave) Cstlport_ptrunf( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_queue/src/stlport_queue.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_queue/src/stlport_queue.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_queue* self = new (ELeave) Cstlport_queue( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_rawiter/src/stlport_rawiter.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_rawiter/src/stlport_rawiter.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_rawiter* self = new (ELeave) Cstlport_rawiter( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_remcopy/src/stlport_remcopy.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_remcopy/src/stlport_remcopy.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_remcopy* self = new (ELeave) Cstlport_remcopy( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_remcpif/src/stlport_remcpif.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_remcpif/src/stlport_remcpif.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_remcpif* self = new (ELeave) Cstlport_remcpif( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_remif/src/stlport_remif.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_remif/src/stlport_remif.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_remif* self = new (ELeave) Cstlport_remif( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_remove/src/stlport_remove.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_remove/src/stlport_remove.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_remove* self = new (ELeave) Cstlport_remove( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_repcpif/src/stlport_repcpif.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_repcpif/src/stlport_repcpif.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_repcpif* self = new (ELeave) Cstlport_repcpif( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_replace/src/stlport_replace.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_replace/src/stlport_replace.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_replace* self = new (ELeave) Cstlport_replace( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_replcpy/src/stlport_replcpy.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_replcpy/src/stlport_replcpy.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_replcpy* self = new (ELeave) Cstlport_replcpy( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_replif/src/stlport_replif.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_replif/src/stlport_replif.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_replif* self = new (ELeave) Cstlport_replif( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_revbit/src/stlport_revbit.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_revbit/src/stlport_revbit.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_revbit* self = new (ELeave) Cstlport_revbit( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_revcopy/src/stlport_revcopy.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_revcopy/src/stlport_revcopy.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_revcopy* self = new (ELeave) Cstlport_revcopy( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_reverse/src/stlport_reverse.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_reverse/src/stlport_reverse.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_reverse* self = new (ELeave) Cstlport_reverse( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_reviter/src/stlport_reviter.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_reviter/src/stlport_reviter.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_reviter* self = new (ELeave) Cstlport_reviter( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_rndshuf/src/stlport_rndshuf.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_rndshuf/src/stlport_rndshuf.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_rndshuf* self = new (ELeave) Cstlport_rndshuf( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_rotate/src/stlport_rotate.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_rotate/src/stlport_rotate.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_rotate* self = new (ELeave) Cstlport_rotate( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_rotcopy/src/stlport_rotcopy.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_rotcopy/src/stlport_rotcopy.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_rotcopy* self = new (ELeave) Cstlport_rotcopy( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_search/src/stlport_search.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_search/src/stlport_search.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_search* self = new (ELeave) Cstlport_search( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_search1/src/stlport_search1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_search1/src/stlport_search1.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_search1* self = new (ELeave) Cstlport_search1( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_seek/src/stlport_seek.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_seek/src/stlport_seek.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_seek* self = new (ELeave) Cstlport_seek( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_set/src/stlport_set.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_set/src/stlport_set.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_set* self = new (ELeave) Cstlport_set( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_setdiff/src/stlport_setdiff.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_setdiff/src/stlport_setdiff.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_setdiff* self = new (ELeave) Cstlport_setdiff( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_setintr/src/stlport_setintr.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_setintr/src/stlport_setintr.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_setintr* self = new (ELeave) Cstlport_setintr( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_setsymd/src/stlport_setsymd.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_setsymd/src/stlport_setsymd.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_setsymd* self = new (ELeave) Cstlport_setsymd( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_setunon/src/stlport_setunon.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_setunon/src/stlport_setunon.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_setunon* self = new (ELeave) Cstlport_setunon( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_slist/src/stlport_slist.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_slist/src/stlport_slist.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_slist* self = new (ELeave) Cstlport_slist( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_sort/src/stlport_sort.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_sort/src/stlport_sort.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_sort* self = new (ELeave) Cstlport_sort( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_sstream/src/stlport_sstream.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_sstream/src/stlport_sstream.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_sstream* self = new (ELeave) Cstlport_sstream( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_stack/src/stlport_stack.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_stack/src/stlport_stack.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_stack* self = new (ELeave) Cstlport_stack( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_stblptn/src/stlport_stblptn.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_stblptn/src/stlport_stblptn.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_stblptn* self = new (ELeave) Cstlport_stblptn( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_stblsrt/src/stlport_stblsrt.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_stblsrt/src/stlport_stblsrt.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_stblsrt* self = new (ELeave) Cstlport_stblsrt( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_strass/src/stlport_strass.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_strass/src/stlport_strass.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_strass* self = new (ELeave) Cstlport_strass( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_string/src/stlport_string.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_string/src/stlport_string.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_string* self = new (ELeave) Cstlport_string( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_swap/src/stlport_swap.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_swap/src/stlport_swap.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_swap* self = new (ELeave) Cstlport_swap( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_swprnge/src/stlport_swprnge.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_swprnge/src/stlport_swprnge.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_swprnge* self = new (ELeave) Cstlport_swprnge( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_times/src/stlport_times.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_times/src/stlport_times.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_times* self = new (ELeave) Cstlport_times( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_trnsfrm/src/stlport_trnsfrm.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_trnsfrm/src/stlport_trnsfrm.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_trnsfrm* self = new (ELeave) Cstlport_trnsfrm( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_tstdeq/src/stlport_tstdeq.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_tstdeq/src/stlport_tstdeq.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_tstdeq* self = new (ELeave) Cstlport_tstdeq( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ucompos/src/stlport_ucompos.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_ucompos/src/stlport_ucompos.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_ucompos* self = new (ELeave) Cstlport_ucompos( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_unegate/src/stlport_unegate.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_unegate/src/stlport_unegate.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_unegate* self = new (ELeave) Cstlport_unegate( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_uniqcpy/src/stlport_uniqcpy.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_uniqcpy/src/stlport_uniqcpy.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_uniqcpy* self = new (ELeave) Cstlport_uniqcpy( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_unique/src/stlport_unique.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_unique/src/stlport_unique.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_unique* self = new (ELeave) Cstlport_unique( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_uprbnd/src/stlport_uprbnd.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_uprbnd/src/stlport_uprbnd.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_uprbnd* self = new (ELeave) Cstlport_uprbnd( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_vec/src/stlport_vec.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/auto/stlport_vec/src/stlport_vec.cpp Mon May 03 14:06:43 2010 +0300
@@ -113,8 +113,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_vec* self = new (ELeave) Cstlport_vec( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdcpp/tsrc/Stdcpp_test/stlport/manual/stlport_istmit/src/stlport_istmit.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdcpp/tsrc/Stdcpp_test/stlport/manual/stlport_istmit/src/stlport_istmit.cpp Mon May 03 14:06:43 2010 +0300
@@ -115,8 +115,12 @@
#ifdef LIBC_OLD_BACKEND
MrtInit();
#endif
+ #ifdef __ARMCC__
+ #pragma diag_suppress 830
+ #endif
Cstlport_istmit* self = new (ELeave) Cstlport_istmit( aTestModuleIf );
+
CleanupStack::PushL( self );
self->ConstructL();
CleanupStack::Pop();
--- a/stdlibs/install/openc_liblogger_stub.pkg Fri Apr 16 16:46:38 2010 +0300
+++ b/stdlibs/install/openc_liblogger_stub.pkg Mon May 03 14:06:43 2010 +0300
@@ -17,7 +17,7 @@
&EN
;Header
-#{"Open C LIBLOGGER"},(0x200110CD),1,7,0, TYPE=SA
+#{"Open C LIBLOGGER"},(0x200110CD),1,7,4
;Localised Vendor name
%{"Nokia"}
Binary file stdlibs/install/openc_liblogger_stub.sis has changed
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/stdlibs/install/openc_signalserver_stub.pkg Mon May 03 14:06:43 2010 +0300
@@ -0,0 +1,25 @@
+;
+; Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+; All rights reserved.
+; This component and the accompanying materials are made available
+; under the terms of "Eclipse Public License v1.0"
+; which accompanies this distribution, and is available
+; at the URL "http://www.eclipse.org/legal/epl-v10.html".
+;
+; Initial Contributors:
+; Nokia Corporation - initial contribution.
+;
+; Contributors:
+;
+; Description: package file for standard libraries
+;
+;
+&EN
+
+#{"Signal Server"}, (0x2002372A), 1, 7, 4
+%{"Nokia"}
+:"Nokia"
+
+[0x1028315F],0, 0, 0 ,{"S60Product5thEdition "}
+
+""-"z:\sys\bin\signalserver.exe", FF
Binary file stdlibs/install/openc_signalserver_stub.sis has changed
Binary file stdlibs/install/openc_stdlibs_stub.pkg has changed
Binary file stdlibs/install/openc_stdlibs_stub.sis has changed
--- a/stdlibs/libcrypt/group/libcrypt.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdlibs/libcrypt/group/libcrypt.mmp Mon May 03 14:06:43 2010 +0300
@@ -23,7 +23,7 @@
CAPABILITY ALL -TCB
VENDORID 0x101FB657
-VERSION 1.0
+VERSION 1.1
MACRO SYMBIAN
--- a/stdlibs/libz/group/libz.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdlibs/libz/group/libz.mmp Mon May 03 14:06:43 2010 +0300
@@ -32,6 +32,7 @@
CAPABILITY ALL -TCB
VENDORID VID_DEFAULT
+VERSION 10.1
USERINCLUDE ../inc
USERINCLUDE ../zlib
--- a/stdlibs/libz/group/libz_build91.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdlibs/libz/group/libz_build91.mmp Mon May 03 14:06:43 2010 +0300
@@ -32,6 +32,7 @@
CAPABILITY ALL -TCB
VENDORID VID_DEFAULT
+VERSION 10.1
USERINCLUDE ../inc
USERINCLUDE ../zlib
--- a/stdlibs/libz/group/libzcore.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdlibs/libz/group/libzcore.mmp Mon May 03 14:06:43 2010 +0300
@@ -34,6 +34,7 @@
CAPABILITY ALL -TCB
VENDORID VID_DEFAULT
+VERSION 10.1
USERINCLUDE ../inc
USERINCLUDE ../zlib
--- a/stdlibs/libz/group/libzcore_build91.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/stdlibs/libz/group/libzcore_build91.mmp Mon May 03 14:06:43 2010 +0300
@@ -35,6 +35,7 @@
CAPABILITY ALL -TCB
VENDORID VID_DEFAULT
+VERSION 10.1
USERINCLUDE ../inc
USERINCLUDE ../zlib
--- a/utilitylibraries/libutils/group/libutils.mmp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/group/libutils.mmp Mon May 03 14:06:43 2010 +0300
@@ -63,6 +63,4 @@
-
-
SMPSAFE
--- a/utilitylibraries/libutils/tsrc/nft/src/test_tlit8towstring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/nft/src/test_tlit8towstring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -28,7 +28,6 @@
TBuf8 <20>src;
src.Copy(Kname);
wstring str;
- int size=10;
int retval =ESuccess;
int i=0;
while (i<=1000)
--- a/utilitylibraries/libutils/tsrc/nft/src/test_tptr16towstring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/nft/src/test_tptr16towstring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -27,7 +27,6 @@
wstring des((const wchar_t*)"hello") ;
TPtr16 src((unsigned short *)"",1, 30);
int retval=ESuccess;
- int size=30;
int i=0;
while (i<=1000)
{
--- a/utilitylibraries/libutils/tsrc/nft/src/test_tptr8towstring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/nft/src/test_tptr8towstring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -27,7 +27,6 @@
wstring des((const wchar_t*)"hellohello") ;
TPtr8 src((unsigned char *)"Hello World", 11, 35);
int retval=ESuccess;
- int size=30;
int i=0;
while (i<=1000)
{
@@ -48,4 +47,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr8towstring_positive1");
+ return;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -29,30 +29,36 @@
int retval1 = 0, retval2 = 0,retval3 = 0,retval4,retval5,retval6;
int ret =0 ;
retval1 = StringToTptrc8(str1, buf1);
+ printf("retval1 value is %d\n", retval1);
TPtrC8 src1 = buf1;
char *des1= new char[20];
int size1=20;
retval2= Tptrc8ToCharp(src1,des1,size1);
-
+ printf("retval2 value is %d\n", retval2);
+
char* src2 = des1;
TBuf8 <20> des2;
retval3 = CharToTbuf8 (src2, des2);
-
+ printf("retval3 value is %d\n", retval3);
+
TBuf8<20>src3= des2;
wchar_t * des3= new wchar_t [20];
int size2=20;
retval4= Tbuf8ToWchar(src3,des3,size2);
-
+ printf("retval4 value is %d\n", retval4);
+
wchar_t* src4 = des3;
TPtrC8 des4;
char *size = new char[2*wcslen(src4)];
retval5 = WcharpToTptrc8(src4, size ,des4);
-
+ printf("retval5 value is %d\n", retval5);
+
string str2;
TPtrC8 src5 = des4;
retval6 = Tptrc8ToString(src5, str2);
-
+ printf("retval6 value is %d\n", retval6);
+
ret= strncmp((char *)str1.c_str(),(char *)str2.c_str(),11);
if(ret == ESuccess)
{
@@ -69,4 +75,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario10.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario10.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,29 +28,35 @@
char *des1= new char[20];
int ret,retval1,retval2,retval3,retval4,retval5,retval6,size1=20,size2=80;
retval1= Tptr8ToChar(src1,des1,size1);
-
+ printf("retval1 value is %d\n", retval1);
+
char *src2= des1;
RBuf8 des2;
retval2= CharToRbuf8(src2,des2);
+ printf("retval2 value is %d\n", retval2);
RBuf8 src3;
src3.CreateL(des2,10);
string des3;
retval3= Rbuf8ToString(src3,des3);
-
+ printf("retval3 value is %d\n", retval3);
+
string src4=des3;
wchar_t temp[30];
TPtr16 des4((unsigned short *)temp,30);
wchar_t *aPtr= new wchar_t[30];
retval4= StringToTptr16(src4,aPtr,des4);
-
+ printf("retval4 value is %d\n", retval4);
+
TPtr16 src5=des4;
char *des5= new char[50];
retval5= Tptr16ToCharp(src5,des5,size2);
-
+ printf("retval5 value is %d\n", retval5);
+
char *src6= des5;
TPtr8 des6((unsigned char*)" ",20);
retval6= CharpToTptr8(src6,des6);
+ printf("retval6 value is %d\n", retval6);
ret= strncmp((const char *)src1.Ptr(),(const char *) des6.Ptr(),10);
if(ret==ESuccess)
@@ -70,4 +76,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario10");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario11.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario11.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,27 +28,33 @@
char *des1=new char[10];
int ret,retval1,retval2,retval3,retval4,retval5,retval6,size1=20,size2=40;
retval1=Tptrc8ToCharp(src1,des1,size1);
-
+ printf("retval1 value is %d\n", retval1);
+
char *src2=des1;
TBuf16<20> des2;
retval2=CharToTbuf16(src2,des2);
-
+ printf("retval2 value is %d\n", retval2);
+
TBuf16<20>src3=des2;
string des3;
retval3=Tbuf16ToString(src3,des3);
-
+ printf("retval3 value is %d\n", retval3);
+
string src4=des3;
TBuf16<20>des4;
retval4= StringToTbuf16(src4,des4);
-
+ printf("retval4 value is %d\n", retval4);
+
TBuf16<40>src5=des4;
char *des5= new char[40];
retval5=Tbuf16ToChar(des4,des5,size2);
-
+ printf("retval5 value is %d\n", retval5);
+
char *src6=des5;
TPtrC8 des6;
retval6=CharpToTptrc8(src6,des6);
-
+ printf("retval6 value is %d\n", retval6);
+
ret= strncmp((char*)src1.Ptr(),(char*) des6.Ptr(),5);
if(ret == ESuccess)
{
@@ -64,4 +70,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario11");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario12.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario12.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,31 +28,36 @@
TBuf8<20>buf(_L8("descriptor"));
src1.Create(buf);
char *des1= new char[10];
- int ret,retval1,retval2,retval3,retval4,retval5,retval6;
+ int ret,retval2,retval3,retval4,retval5,retval6;
int size1=20;
retval2=Rbuf8ToChar(src1,des1,size1);
char *src2=des1;
RBuf16 des2;
retval2=CharToRbuf16(src2,des2);
+ printf("retval2 value is %d\n", retval2);
RBuf16 src3;
src3.Create(des2);
string des3;
retval3=Rbuf16ToString(src3,des3);
+ printf("retval3 value is %d\n", retval3);
string src4=des3;
TBuf8 <30> des4;
retval4 = StringToTbuf8(src4,des4);
-
+ printf("retval4 value is %d\n", retval4);
+
TBuf8<20>src5= des4;
char * des5= new char [30];
retval5= Tbuf8ToChar(src5,des5,size1);
-
+ printf("retval5 value is %d\n", retval5);
+
char* src6=des5;
RBuf8 des6;
retval6= CharToRbuf8(src6,des6);
-
+ printf("retval6 value is %d\n", retval6);
+
ret= strncmp((const char*)src1.Ptr(),(const char*)des6.Ptr(),10);
if(ret == ESuccess)
{
@@ -72,4 +77,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario12");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario13.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario13.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -30,21 +30,24 @@
char *des1 = new char[30];
int size1=30,retval1,retval2,retval3,retval4,ret;
retval1= Hbufc8ToChar(src1,des1,size1);
+ printf("retval1 value is %d\n", retval1);
char *src2=des1;
TPtrC16 des2((unsigned short *)"",20);
wchar_t *aPtr=new wchar_t[20];
retval2=CharpToTptrc16(src2,aPtr,des2);
-
+ printf("retval2 value is %d\n", retval2);
TPtrC16 src3= des2;
char *des3= new char[20];
retval3= Tptrc16ToCharp(src3,des3,size1);
-
+ printf("retval3 value is %d\n", retval3);
+
char *src4=des3;
HBufC16 *des4=HBufC16::NewMaxL(20);
retval4= CharToHbufc16(src4,des4);
-
+ printf("retval4 value is %d\n", retval4);
+
char *temp = new char [des4->Length()];
wcstombs(temp, (const wchar_t *)des4->Ptr() , 7);
temp[7] = '\0';
@@ -67,4 +70,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario13");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario14.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario14.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,28 +28,34 @@
TBuf8<10> des1;
int ret,retval1,retval2,retval3,retval4,retval5,retval6,size1=20,size2=40;
retval1= StringToTbuf8(src1,des1);
-
+ printf("retval1 value is %d\n", retval1);
+
TBuf8<10>src2=des1;
char *des2= new char[10];
retval2=Tbuf8ToChar(src2,des2,size1);
-
+ printf("retval2 value is %d\n", retval2);
+
char *src3=des2;
TBuf16<20> des3;
retval3= CharToTbuf16(src3,des3);
-
+ printf("retval3 value is %d\n", retval3);
+
TBuf16<20> src4=des3;
string des4("");
retval4=Tbuf16ToString(src4,des4);
-
+ printf("retval4 value is %d\n", retval4);
+
string src5=des4;
TPtr16 des5((unsigned short*)"",30);
wchar_t *aPtr= new wchar_t[30];
retval5= StringToTptr16(src5,aPtr,des5);
-
+ printf("retval5 value is %d\n", retval5);
+
TPtr16 src6=des5;
char *des6= new char[20];
retval6= Tptr16ToCharp(src6,des6,size2);
-
+ printf("retval6 value is %d\n", retval6);
+
ret= strncmp("testing",(const char*)des6,7);
if(ret == ESuccess)
{
@@ -66,4 +72,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario14");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario15.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario15.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,29 +28,35 @@
TPtrC8 des1((unsigned char*)" ",30);
int retval1, retval2,retval3,retval4,retval5,retval6,ret,size1=20;
retval1= StringToTptrc8(src1,des1);
-
+ printf("retval1 value is %d\n", retval1);
+
TPtrC8 src2 = des1;
char *des2= new char[20];
retval2= Tptrc8ToCharp(src2,des2,size1);
-
+ printf("retval2 value is %d\n", retval2);
+
char * src3= des2;
TPtr16 des3((unsigned short*)"",30);
wchar_t *aPtr1 = new wchar_t[20];
retval3= CharpToTptr16(src3,aPtr1,des3);
-
+ printf("retval3 value is %d\n", retval3);
+
TPtr16 src4= des3;
string des4;
retval4= Tptr16ToString(src4,des4);
-
+ printf("retval4 value is %d\n", retval4);
+
string src5= des4;
TPtrC16 des5((unsigned short*)"",30);
wchar_t *aPtr2= new wchar_t[20];
retval5= StringToTptrc16(src5,aPtr2,des5);
-
+ printf("retval5 value is %d\n", retval5);
+
TPtrC16 src6= des5;
char *des6= new char[30];
retval6= Tptrc16ToCharp(src6,des6,size1);
-
+ printf("retval6 value is %d\n", retval6);
+
ret= strncmp("!@#$%^&",(const char*)des6,7);
if(ret == ESuccess)
{
@@ -68,4 +74,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario15");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario16.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario16.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,16 +28,20 @@
wchar_t* mycharstring = L"hellohello";
RBuf16 buf;
retval[0]= WcharToRbuf16(mycharstring,buf);
+ printf("The first value in retval array is %d\n", retval[0]);
wstring str;
retval[1]= Rbuf16ToWstring(buf,str);
+ printf("The second value in retval array is %d\n", retval[1]);
TBuf16 <15> tbuf;
retval[2]= WstringToTbuf16(str,tbuf);
+ printf("The third value in retval array is %d\n", retval[2]);
wchar_t* myfinalstring= new wchar_t[15];
int size=15;
retval[3]= Tbuf16ToWchar(tbuf,myfinalstring,size);
+ printf("The fourth value in retval array is %d\n", retval[3]);
if(!wcscmp(mycharstring,myfinalstring))
{
@@ -53,4 +57,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario16");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario17.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario17.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -38,6 +38,12 @@
wchar_t* myfinalstring= new wchar_t[15];
int size=15;
retval[4]= Tbuf16ToWchar(tbuf,myfinalstring,size);
+
+ for(int i=1; i<=4; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",(retval[i]));
+ }
if(!wcscmp(mycharstring,myfinalstring))
{
@@ -53,4 +59,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario17");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario18.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario18.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -38,6 +38,12 @@
wchar_t* myfinalstring= new wchar_t[35];
int size=35;
retval[4]= Tbuf8ToWchar(tbuf,myfinalstring,size);
+
+ for(int i=1; i<=4; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!wcscmp(mycharstring,myfinalstring))
{
@@ -53,4 +59,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario18");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario19.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario19.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -52,6 +52,12 @@
buf8.Close();
int size8=35;
retval[8]= Tbuf8ToWchar(tbuf1,myfinalstring,size8);
+
+ for(int i=1; i<=8; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!wcscmp(mycharstring,myfinalstring))
{
@@ -66,4 +72,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario19");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -29,30 +29,36 @@
int retval1, retval2,retval3,retval4,retval5,retval6;
int ret;
retval1 = StringToTptr8(src1, des1);
+ printf("retval1 value is %d\n", retval1);
TPtr8 src2 = des1;
char *des2= new char[30];
int size1=30;
retval2= Tptr8ToChar(src2,des2,size1);
+ printf("retval2 value is %d\n", retval2);
char* src3 = des2;
TBuf8 <30> des3;
retval3 = CharToTbuf8 (src3, des3);
-
+ printf("retval3 value is %d\n", retval3);
+
TBuf8<30>src4= des3;
wchar_t * des4= new wchar_t [30];
int size2=30;
retval4= Tbuf8ToWchar(src4,des4,size2);
+ printf("retval4 value is %d\n", retval4);
wchar_t* src5 = des4;
TPtr8 des5((unsigned char *)" ",50);
char * cPtr= new char[50];
retval5 = WcharpToTptr8(src5,cPtr,des5);
+ printf("retval5 value is %d\n", retval5);
string des6("");
TPtr8 src6 = des5;
retval6 = Tptr8ToString(src6, des6);
-
+ printf("retval6 value is %d\n", retval6);
+
ret= strncmp((char *)src1.c_str(),(char *)des6.c_str(),11);
if(ret == ESuccess)
{
@@ -69,4 +75,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario20.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario20.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -50,6 +50,12 @@
wchar_t* temp = new wchar_t[50];
TPtrC16 tptrc;
retval[6]= StringToTptrc16(mystring,temp,tptrc);
+
+ for(int i=1; i<=6; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
wchar_t* myfinalstring = new wchar_t[50];
int size_fin=55;
@@ -73,4 +79,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario20");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario21.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario21.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -39,6 +39,12 @@
wstring myFinalWstr(L"kjhskjfhsakhssjhfdkjshfdks") ;
retval[4] = Hbufc16ToWstring(hbufc,myFinalWstr);
+
+ for(int i=1; i<=4; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!wcscmp((wchar_t *)mystring.c_str(),(wchar_t *)myFinalWstr.c_str()))
{
@@ -54,4 +60,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario21");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario22.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario22.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -47,6 +47,12 @@
wchar_t* myFinWchar = new wchar_t[21];
int size = 20;
retval[5] = Tptrc8ToWcharp(myTptr8,myFinWchar,size);
+
+ for(int i=1; i<=5; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!wcscmp(myWchar,myFinWchar))
{
@@ -63,4 +69,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario22");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario23.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario23.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -49,6 +49,12 @@
wchar_t* Wstr_fin = new wchar_t[36];
int size_char=36;
retval[5] = Tptr8ToWcharp(myTptr,Wstr_fin,size_char);
+
+ for(int i=1; i<=5; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!wcscmp(myWchar,Wstr_fin))
{
@@ -65,4 +71,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario23");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario24.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario24.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -55,6 +55,12 @@
wchar_t* Wstr_fin = new wchar_t[36];
int size_char=36;
retval[5] = Tptr8ToWcharp(myTptr,Wstr_fin,size_char);
+
+ for(int i=1; i<=5; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!wcscmp(myWchar,Wstr_fin))
{
@@ -73,4 +79,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario24");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario25.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario25.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -48,6 +48,12 @@
HBufC16* finBuffer = HBufC16::NewMaxL(20);
retval[6] = WcharToHbufc16(Wstr_fin,finBuffer);
+
+ for(int i=1; i<=6; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!buffer->Compare(finBuffer->Des()))
{
@@ -65,4 +71,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario25");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario26.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario26.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -51,6 +51,12 @@
HBufC8* finBuffer = HBufC8::NewL(10);
*finBuffer = text_fin;
retval[6] = WcharToHbufc8(Wstr_fin,finBuffer);
+
+ for(int i=1; i<=6; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!buffer->Compare(finBuffer->Des()))
{
@@ -69,4 +75,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario26");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario27.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario27.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -42,6 +42,12 @@
wchar_t* myfinalstring= new wchar_t[15];
int size_new=15;
retval[4]= Tbuf16ToWchar(tbuf,myfinalstring,size_new);
+
+ for(int i=1; i<=4; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!wcscmp(myWchar,myfinalstring))
{
@@ -58,4 +64,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario27");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario28.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario28.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -42,6 +42,12 @@
wchar_t* myfinalstring= new wchar_t[15];
int size_new=15;
retval[4]= Tbuf16ToWchar(tbuf,myfinalstring,size_new);
+
+ for(int i=1; i<=4; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
if(!wcscmp(myWchar,myfinalstring))
{
@@ -58,4 +64,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario28");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario29.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario29.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,8 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+#pragma diag_suppress 550
+int main()
{
bool assert_failed = false;
__UHEAP_MARK;
@@ -147,6 +148,12 @@
wchar_t* des25 = new wchar_t[150];
int size8=150;
retval[29]= Tbuf8ToWchar(des24,des25,size8);
+
+ for(int i=1; i<=29; i++)
+ {
+ if (retval[i]!= 0)
+ printf("Conversion failed for retval\n",retval[i]);
+ }
ret= strncmp((char *)src1.c_str(),(char *)des24.Ptr(),7);
if(ret == ESuccess)
@@ -181,5 +188,6 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario29");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario3.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario3.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,36 +20,42 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
char * src1="test";
HBufC8 *des1= HBufC8::NewMaxL(20);
int ret,retval1,retval2,retval3,retval4,retval5,retval6;
- int size1=20,size2=20,size3=20;
+ int /*size1=20,*/size2=20,size3=20;
__UHEAP_MARK;
{
retval1= CharToHbufc8(src1,des1);
+ printf("retval1 value is %d\n", retval1);
string des2("test");
HBufC8 *src2= des1;
retval2= Hbufc8ToString(src2,des2);
+ printf("retval2 value is %d\n", retval2);
string src3=des2;
TPtr8 des3((unsigned char *)" ",20);
retval3 = StringToTptr8(src3, des3);
+ printf("retval3 value is %d\n", retval3);
TPtr8 src4 = des3;
wchar_t *des4= new wchar_t[42];
retval4= Tptr8ToWcharp(src4,des4,size2);
+ printf("retval4 value is %d\n", retval4);
wchar_t* src5=des4;
TPtr8 des5((unsigned char*)" ",42);
char * cPtr= new char[30];
retval5=WcharpToTptr8(src5,cPtr,des5);
+ printf("retval5 value is %d\n", retval5);
TPtr8 src6 = des5;
char *des6= new char[42];
- retval6= Tptr8ToChar(src6,des6,size3);
+ retval6= Tptr8ToChar(src6,des6,size3);
+ printf("retval6 value is %d\n", retval6);
ret= strncmp((char*)src1,(char*)des6,4);
if(ret == ESuccess)
@@ -70,4 +76,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario3");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario4.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario4.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,45 +20,53 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
char* src1 = "Hello Char String";
TBufC8<30> buf;
TPtr8 des1= buf.Des();
int ret, retval1,retval2,retval3,retval4,retval5,retval6,retval7,retval8;
retval1 = CharpToTptr8(src1,des1);
+ printf("retval1 value is %d\n", retval1);
__UHEAP_MARK;
{
string des2="";
TPtr8 src2 = des1;
retval2 = Tptr8ToString(src2, des2);
-
+ printf("retval2 value is %d\n", retval2);
+
string src3=des2;
TBuf8 <30> des3;
retval3 = StringToTbuf8(src3,des3);
+ printf("retval3 value is %d\n", retval3);
TBuf8<20>src4= des3;
wchar_t * des4= new wchar_t [30];
int size1=30;
retval4= Tbuf8ToWchar(src4,des4,size1);
+ printf("retval4 value is %d\n", retval4);
wchar_t* src5 = des4;
TBuf8<50> des5;
retval5 = WcharToTbuf8(src5,des5);
+ printf("retval5 value is %d\n", retval5);
TBuf8 <50> src6 = des5;
string des6="";
retval6 = Tbuf8ToString(src6,des6);
+ printf("retval6 value is %d\n", retval6);
string src7=des6;
TPtrC8 des7;
retval7 = StringToTptrc8(src7,des7);
+ printf("retval7 value is %d\n", retval7);
TPtrC8 src8 = des7;
char *des8= new char[30];
int size2=30;
retval8= Tptrc8ToCharp(src8,des8,size2);
+ printf("retval8 value is %d\n", retval8);
ret= strncmp("Hello Char String",(char*)des8,17);
if(ret == ESuccess)
@@ -75,4 +83,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario4");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario5.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario5.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,36 +20,42 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
char* src1 = "Hello Char String";
TPtrC8 des1;
int ret,retval1,retval2,retval3,retval4,retval5,retval6;
retval1 = CharpToTptrc8(src1,des1);
+ printf("retval1 value is %d\n", retval1);
__UHEAP_MARK;
{
string des2;
TPtrC8 src2 = des1;
retval2 = Tptrc8ToString(src2, des2);
+ printf("retval2 value is %d\n", retval2);
string src3="Hello Char String";
TBuf8 <30> des3;
retval3 = StringToTbuf8(src3,des3);
+ printf("retval3 value is %d\n", retval3);
TBuf8<20>src4= des3;
char * des4= new char [30];
int size1=30;
retval4= Tbuf8ToChar(src4,des4,size1);
+ printf("retval4 value is %d\n", retval4);
char * src5= des4;
HBufC8 *des5= HBufC8::NewMaxL(30);
retval5= CharToHbufc8(src5,des5);
+ printf("retval5 value is %d\n", retval5);
HBufC8 *src6= des5;
char *des6 = new char[30];
int size2=30;
retval6= Hbufc8ToChar(src6,des6,size2);
+ printf("retval6 value is %d\n", retval6);
ret= strncmp((char*)src1,(char*)des6,17);
if(ret == ESuccess)
@@ -67,4 +73,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario5");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario6.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario6.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -29,28 +29,34 @@
int ret,retval1,retval2,retval3,retval4,retval5,retval6;
int size1=39;
retval1= CharToRbuf8(src1,des1);
+ printf("retval1 value is %d\n", retval1);
RBuf8 src2;
src2.Create(des1);
string des2;
retval2= Rbuf8ToString(src2,des2);
+ printf("retval2 value is %d\n", retval2);
string src3=des2;
HBufC8 *des3= HBufC8::NewMaxL(20);
retval3= StringToHbufc8(src3,des3);
+ printf("retval3 value is %d\n", retval3);
HBufC8 *src4=des3;
string des4;
retval4= Hbufc8ToString(src4,des4);
+ printf("retval4 value is %d\n", retval4);
string src5=des4;
TBuf16<20> des5;
retval5= StringToTbuf16(src5,des5);
+ printf("retval5 value is %d\n", retval5);
TBuf16<20> src6=des5;
char *des6= new char[39];
retval6= Tbuf16ToChar(src6,des6,size1);
-
+ printf("retval6 value is %d\n", retval6);
+
ret= strncmp((char*)src1,(char*)des6,17);
if(ret == ESuccess)
{
@@ -68,4 +74,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario6");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario7.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario7.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,27 +28,33 @@
char * des1= new char [20];
int size1=20,ret,retval1,retval2,retval3,retval4,retval5,retval6;
retval1= Tbuf8ToChar(src1,des1,size1);
+ printf("retval1 value is %d\n", retval1);
char * src2= des1;
TPtr8 des2((unsigned char*)" ",7);
- retval2=CharpToTptr8(src2,des2);
+ retval2=CharpToTptr8(src2,des2);
+ printf("retval2 value is %d\n", retval2);
TPtrC8 src3= des2;
string des3;
retval3= Tptrc8ToString(src3,des3);
+ printf("retval3 value is %d\n", retval3);
string src4=des3;
HBufC16 *des4= HBufC16::NewMaxL(20);
retval4= StringToHbufc16(src4,des4);
+ printf("retval4 value is %d\n", retval4);
HBufC16 *src5= des4;
string des5="";
int size2=40;
retval5= Hbufc16ToString(src5,des5,size2);
+ printf("retval5 value is %d\n", retval5);
string src6=des5;
TBuf8<50> des6;
retval6= StringToTbuf8(src6,des6);
+ printf("retval6 value is %d\n", retval6);
ret= strncmp((char *)src1.Ptr(),(char *)des6.Ptr(),7);
if(ret == ESuccess)
@@ -66,4 +72,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario7");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario8.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario8.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,32 +20,37 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
TBufC8<10> src1((unsigned char*)"testing");
char * des1= new char[10];
- int size1=50,ret,retval1,retval2,retval3,retval4,retval5,retval6;
+ int size1=50,ret,retval1,retval2,retval3,retval4,retval5;
retval1= Tbufc8ToChar(src1,des1,size1);
+ printf("retval1 value is %d\n", retval1);
char * src2= des1;
TPtr16 des2 ((unsigned short*)" ",30);
wchar_t *aPtr = new wchar_t[50];
retval2= CharpToTptr16(src2,aPtr,des2);
+ printf("retval2 value is %d\n", retval2);
TPtr16 src3= des2;
string des3;
retval3= Tptr16ToString(src3,des3);
+ printf("retval3 value is %d\n", retval3);
string src4= des3;
RBuf16 des4;
retval4= StringToRbuf16(src4,des4);
+ printf("retval4 value is %d\n", retval4);
RBuf16 src5;
src5.Create(des4);
char *des5= new char [50];
retval5 = Rbuf16ToChar(src5,des5,size1);
+ printf("retval5 value is %d\n", retval5);
ret= strncmp("testing",(char*)des5,7);
if(ret == ESuccess)
@@ -65,4 +70,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario8");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/integration_test_scenario9.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/integration_test_scenario9.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,24 +28,29 @@
char *des1= new char[20];
int size1=20,ret,retval1,retval2,retval3,retval4,retval5,size2=40;
retval1= Tlitc8ToChar(src1,des1,size1);
+ printf("retval1 value is %d\n", retval1);
char *src2= des1;
RBuf8 des2;
retval2= CharToRbuf8(src2,des2);
+ printf("retval2 value is %d\n", retval2);
RBuf8 src3;
src3.Create(des2);
string des3;
retval3= Rbuf8ToString(src3,des3);
+ printf("retval3 value is %d\n", retval3);
string src4=des3;
TPtrC16 des4((unsigned short*)" ",50);
wchar_t *aPtr= new wchar_t[20];
retval4= StringToTptrc16(src4,aPtr,des4);
+ printf("retval4 value is %d\n", retval4);
TPtrC16 src5= des4;
char *des5= new char[30];
retval5= Tptrc16ToCharp(src5,des5,size2);
+ printf("retval5 value is %d\n", retval5);
ret= strncmp("integration_test9",(char*)des5,17);
if(ret == ESuccess)
@@ -65,4 +70,5 @@
}
__UHEAP_MARKEND;
testResultXml("integration_test_scenario9");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr16_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr16_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -45,4 +45,5 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_charptotptr16_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr16_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr16_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,5 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_charptotptr16_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr16_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr16_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,5 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_charptotptr16_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_charptotptr16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_charptotptr16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr16_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr16_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_charptotptr16_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr16_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr16_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_charptotptr16_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr8_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr8_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptr8_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr8_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr8_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptr8_boundary2");
+ return 0;
+
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr8_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr8_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptr8_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -40,4 +40,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptr8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -40,4 +40,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptr8_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -40,4 +40,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptr8_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptr8_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptr8_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -40,4 +40,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptr8_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,5 @@
free(myptr);
__UHEAP_MARKEND;
testResultXml("test_charptotptrc16_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -45,4 +45,5 @@
free(myptr);
__UHEAP_MARKEND;
testResultXml("test_charptotptrc16_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,5 @@
}
free(myptr);
testResultXml("test_charptotptrc16_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,5 @@
free(myptr);
__UHEAP_MARKEND;
testResultXml("test_charptotptrc16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,5 @@
free(myptr);
__UHEAP_MARKEND;
testResultXml("test_charptotptrc16_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc16_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,5 @@
free(myptr);
__UHEAP_MARKEND;
testResultXml("test_charptotptrc16_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptrc8_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptrc8_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptrc8_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptrc8_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptrc8_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_charptotptrc8_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_charptotptrc8_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartohbufc16_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartohbufc16_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,12 +21,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
while(!err)
{
int retval =ESuccess;
@@ -61,4 +61,5 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_chartohbufc16_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartohubfc16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartohubfc16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartohbufc16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartohubfc16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartohubfc16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartohbufc16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartohubfc16_negative3.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartohubfc16_negative3.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartohbufc16_negative3");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartohubfc16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartohubfc16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartohbufc16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartohubfc8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartohubfc8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartohbufc8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartohubfc8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartohubfc8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartohbufc8_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartohubfc8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartohubfc8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartohbufc8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf16_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf16_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf16_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf16_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf16_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf8_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf8_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf8_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf8_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf8_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartorbuf8_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_chartorbuf8_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf16_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf16_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf16_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
char Des[]="nokianokia";
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf16_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf16_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf16_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 1;
+ //int count = 1;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(1);
while(!err)
{
int retval =ESuccess;
@@ -54,4 +54,5 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_chartotbuf16_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf8_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf8_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf8_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf8_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf8_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_chartotbuf8_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_chartotbuf8_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc16tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc16tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -47,4 +47,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_hbufc16tostring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc16tostring_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc16tostring_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -47,4 +47,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_hbufc16tostring_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc16tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc16tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -47,4 +47,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_hbufc16tostring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc16towchar_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc16towchar_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc16towchar_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc16towchar_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc16towchar_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc16towchar_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc16towchar_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc16towchar_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc16towchar_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc16towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc16towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc16towchar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc16towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc16towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,12 +21,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 3;
+ //int count = 3;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(3);
{
wstring myString;
while(!err)
@@ -58,4 +58,5 @@
__UHEAP_RESET;
testResultXml("test_hbufc16towstring_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8tochar_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8tochar_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc8tochar_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8tochar_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8tochar_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc8tochar_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc8tochar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -46,4 +46,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_hbufc8tostring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -51,4 +51,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_hbufc8tostring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8tostring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8tostring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,12 +21,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 3;
+ //int count = 3;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(3);
{
string myString;
while(!err)
@@ -59,4 +59,5 @@
__UHEAP_RESET;
testResultXml("test_hbufc8tostring_reliabilitysss");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8towchar_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8towchar_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc8towchar_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8towchar_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8towchar_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc8towchar_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8towchar_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8towchar_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc8towchar_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,5 @@
mycharstring = NULL;
__UHEAP_MARKEND;
testResultXml("test_hbufc8towchar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -46,4 +46,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_hbufc8towstring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8towstring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8towstring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -51,4 +51,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_hbufc8towstring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_hbufc8towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_hbufc8towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,12 +21,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 3;
+ //int count = 3;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(3);
{
wstring myString;
while(!err)
@@ -58,4 +58,5 @@
__UHEAP_RESET;
testResultXml("test_hbufc8towstring_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16tochar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -46,4 +46,5 @@
myrbuf.Close();
__UHEAP_MARKEND;
testResultXml("test_rbuf16tochar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16tochar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16tochar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16tochar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16tochar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tochar_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16tochar_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -31,7 +31,7 @@
buf.Create(5);
buf.Copy((TUint16 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf16ToString(buf, des);
int rbuf_len = buf.Length();
@@ -50,4 +50,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_rbuf16tostring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -31,7 +31,7 @@
buf.Create(10);
buf.Copy((TUint16 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf16ToString(buf, des );
int rbuf_len = buf.Length();
@@ -49,4 +49,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_rbuf16tostring_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -31,7 +31,7 @@
buf.Create(10);
buf.Copy((TUint16 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf16ToString(buf, des );
if (retval ==ESuccess )
@@ -47,4 +47,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_rbuf16tostring_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -46,4 +46,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_rbuf16tostring_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16tostring_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -31,7 +31,7 @@
buf.Create(5);
buf.Copy((TUint16 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =6;
+ //int size =6;
retval = Rbuf16ToString(buf, des );
if (retval ==ESuccess)
@@ -47,4 +47,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_rbuf16tostring_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf16towchar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -46,4 +46,5 @@
myrbuf.Close();
__UHEAP_MARKEND;
testResultXml("Test_rbuf16towchar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf16towchar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf16towchar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf16towchar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16towchar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towchar_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf16 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf16towchar_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -33,7 +33,7 @@
buf.Copy((TUint16 *)"Hello",5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf16ToWstring(buf, des);
int rbuf_len = buf.Length();
@@ -64,4 +64,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_rbuf16towstring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des;
__UHEAP_MARK;
@@ -30,7 +30,7 @@
buf.Create(10);
buf.Copy((TUint16 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ // int size =15;
retval = Rbuf16ToWstring(buf, des);
int rbuf_len = buf.Length();
@@ -59,4 +59,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16towstring_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des;
__UHEAP_MARK;
@@ -30,7 +30,7 @@
buf.Create(10);
buf.Copy((TUint16 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf16ToWstring(buf, des);
if (retval ==ESuccess && strcmp("Hello" ,(const char*)des.c_str()) == 0)
@@ -45,4 +45,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16towstring_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des;
__UHEAP_MARK;
@@ -29,7 +29,7 @@
RBuf16 buf;
buf.Create(10);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf16ToWstring(buf, des);
if (retval == EDescriptorNoData)
@@ -44,4 +44,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16towstring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des;
__UHEAP_MARK;
@@ -30,7 +30,7 @@
buf.Create(10);
buf.Copy((TUint16 *)"", 0);
buf.CleanupClosePushL();
- int size =5;
+ //int size =5;
retval = Rbuf16ToWstring(buf, des);
if (retval == EDescriptorNoData)
@@ -45,4 +45,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16towstring_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf16towstring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des;
__UHEAP_MARK;
@@ -30,7 +30,7 @@
buf.Create(10);
buf.Copy((TUint16 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf16ToWstring(buf, des);
if (retval ==ESuccess)
@@ -45,4 +45,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf16towstring_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf8tochar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -46,4 +46,5 @@
myrbuf.Close();
__UHEAP_MARKEND;
testResultXml("Test_rbuf8tochar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf8tochar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf8tochar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf8tochar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("Test_rbuf8tochar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8tostring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s;
@@ -44,4 +44,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8tostring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8tostring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8tostring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s;
@@ -31,6 +31,8 @@
buf.Copy((TUint8 *)"Hello", 5);
buf.CleanupClosePushL();
retval = Rbuf8ToString(buf, s);
+ if(retval == 0)
+ printf("The value of retval is ESuccess\n");
if (!strcmp(s.c_str(), "Hello"))
{
@@ -44,4 +46,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8tostring_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towchar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -46,4 +46,5 @@
myrbuf.Close();
__UHEAP_MARKEND;
testResultXml("test_rbuf8towchar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towchar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towchar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towchar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
RBuf8 myrbuf;
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towchar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring des;
@@ -30,7 +30,7 @@
buf.Create(10);
buf.Copy((TUint8 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf8ToWstring(buf, des );
int rbuf_len = buf.Length();
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towstring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring des;
@@ -30,7 +30,7 @@
buf.Create(10);
buf.Copy((TUint8 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf8ToWstring(buf, des );
int rbuf_len = buf.Length();
@@ -47,4 +47,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towstring_boundary2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring des;
@@ -30,7 +30,7 @@
buf.Create(10);
buf.Copy((TUint8 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf8ToWstring(buf, des );
if (retval ==ESuccess && wcscmp(L"Hello" ,des.c_str()) == 0)
@@ -45,4 +45,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towstring_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring des;
@@ -29,7 +29,7 @@
RBuf8 buf;
buf.Create(10);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf8ToWstring(buf, des );
if (retval == EDescriptorNoData)
@@ -44,4 +44,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towstring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring des;
@@ -31,7 +31,7 @@
buf.Create(10);
buf.Copy((TUint8 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =5;
+ //int size =5;
retval = Rbuf8ToWstring(buf, des );
if (retval == ESuccess)
@@ -47,4 +47,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_rbuf8towstring_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring des;
@@ -30,7 +30,7 @@
buf.Create(10);
buf.Copy((TUint8 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =15;
+ //int size =15;
retval = Rbuf8ToWstring(buf, des);
if (retval ==ESuccess)
@@ -45,4 +45,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towstring_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_rbuf8towstring_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring des;
@@ -30,7 +30,7 @@
buf.Create(5);
buf.Copy((TUint8 *)"Hello", 5);
buf.CleanupClosePushL();
- int size =6;
+ //int size =6;
retval = Rbuf8ToWstring(buf, des );
if (retval ==ESuccess)
@@ -45,4 +45,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_rbuf8towstring_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtohbufc16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtohbufc16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -52,4 +52,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtohbufc16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtohbufc16_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtohbufc16_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,14 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 1;
+ //int count = 1;
bool err = false;
string myString("Hello");
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(1);
+
while(!err)
{
int retval =ESuccess;
@@ -53,4 +54,5 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_stringtohbufc16_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtohbufc8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtohbufc8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_stringtohbufc8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtohbufc8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtohbufc8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_stringtohbufc8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtorbuf16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtorbuf16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include <e32base.h>
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string s("");
__UHEAP_MARK;
@@ -46,4 +46,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_stringtorbuf16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtorbuf16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtorbuf16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string s("testing");
__UHEAP_MARK;
@@ -40,4 +40,5 @@
buf.Close();
__UHEAP_MARKEND;
testResultXml("test_stringtorbuf16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtorbuf8_negative.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtorbuf8_negative.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str;
__UHEAP_MARK;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_stringtorbuf8_negative");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtorbuf8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtorbuf8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -40,4 +40,5 @@
buf.Close();
__UHEAP_MARKEND;
testResultXml("test_stringtorbuf8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string s("Hello");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string s("");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_negative3.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_negative3.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string s;
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf16_negative3");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -46,4 +46,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf16_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,13 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 1;
+ //int count = 1;
bool err = false;
string myString("Hello");
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(1);
while(!err)
{
int retval =ESuccess;
@@ -54,4 +54,5 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_stringtotbuf16_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_boundry.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_boundry.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf8_boundry");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_boundry1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_boundry1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello Worlddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf8_boundry1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_boundry2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_boundry2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
char *s = "Hello World";
string str(s);
@@ -40,4 +40,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf8_boundry2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str;
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf8_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotbuf8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotbuf8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptr16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptr16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s("Hello World");
@@ -42,4 +42,5 @@
wptr = NULL;
__UHEAP_MARKEND;
testResultXml("test_stringtotptr16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptr16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptr16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s("Hello World");
@@ -42,4 +42,5 @@
wptr = NULL;
__UHEAP_MARKEND;
testResultXml("test_stringtotptr16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptr8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptr8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotptr8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptr8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptr8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotptr8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptrc16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptrc16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -42,4 +42,5 @@
temp = NULL;
__UHEAP_MARKEND;
testResultXml("test_stringtotptrc16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptrc16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptrc16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("");
__UHEAP_MARK;
@@ -42,4 +42,5 @@
temp = NULL;
__UHEAP_MARKEND;
testResultXml("test_stringtotptrc16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptrc16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptrc16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptrc8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptrc8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotptrc8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_stringtotptrc8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_stringtotptrc8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string str("Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_stringtotptrc8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_invalidpointer.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_invalidpointer.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16tochar_invalidpointer");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16tochar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"123aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16tochar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"123");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16tochar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16tochar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16tochar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tochar_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"\xAE");
@@ -48,4 +48,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16tochar_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tostring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tostring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf16tostring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf16tostring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf16tostring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"123aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16towchar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"123");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16towchar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16towchar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16towchar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16towchar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16towchar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towchar_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"\xAE");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf16towchar_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf16towstring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf16towstring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towstring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towstring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -48,4 +48,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf16towstring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf16towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf16towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
wstring myString;
while(!err)
@@ -55,4 +55,5 @@
__UHEAP_RESET;
testResultXml("test_tbuf16towstring_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src((TText8*)"testing");
@@ -41,4 +41,5 @@
delete [] des;
__UHEAP_MARKEND;
testResultXml("Test_tbuf8tochar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<300>src((TText8*)"pppppppppppppppppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -41,4 +41,5 @@
delete [] des;
__UHEAP_MARKEND;
testResultXml("Test_tbuf8tochar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<3>src((TText8*)"min");
@@ -41,4 +41,5 @@
delete [] des;
__UHEAP_MARKEND;
testResultXml("Test_tbuf8tochar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src;
@@ -41,4 +41,5 @@
delete [] des;
__UHEAP_MARKEND;
testResultXml("Test_tbuf8tochar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src ((TText8*)"#$%^&*()");
@@ -40,4 +40,5 @@
}
__UHEAP_MARKEND;
testResultXml("Test_tbuf8tochar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src((TText8*)"Hello World");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf8tochar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_recalling.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tochar_recalling.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src1((TText8*)"recalling");
@@ -47,4 +47,5 @@
__UHEAP_MARKEND;
testResultXml("Test_tbuf8tochar_recalling");
close_log_file();
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tostring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tostring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf8tostring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf8tostring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf8tostring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8tostring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8tostring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,17 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s;
__UHEAP_MARK;
TBuf8 <12> buf((const unsigned char *)"Hello");
retval = Tbuf8ToString(buf, s);
-
+ if (retval == ESuccess)
+ {
+ printf("TBuf8 to string conversion successful\n");
+ }
if (!strcmp(s.c_str(), "Hello"))
{
printf("tbuf8tostring Passed");
@@ -39,4 +42,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf8tostring_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src((TText8*)"Hello World");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf8towchar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<300>src((TText8*)"Hello World @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf8towchar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<5>src((TText8*)"Hello");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf8towchar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src((TText8*)"");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf8towchar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src((TText8*)"Hello World");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf8towchar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBuf8<20>src((TText8*)"Hello World");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbuf8towchar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf8towstring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf8towstring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbuf8towstring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbuf8towstring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbuf8towstring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbyfc16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16tochar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"helloaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16tochar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"hello");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16tochar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16tochar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16tochar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbufc16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16tochar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tochar_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"\xAE");
@@ -48,4 +48,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16tochar_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tostring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tostring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbufc16tostring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbufc16tostring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbufc16tostring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16towchar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"123aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16towchar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"123");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16towchar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16towchar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16towchar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16towchar");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16towchar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16towchar_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"\xAE");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc16towchar_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc16towstring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc16towstring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbufc16towstring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"praveen");
@@ -42,4 +42,5 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tbufc8tochar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<300>src((TText8*)"ppppppppppppppppppppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -42,4 +42,5 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tbufc8tochar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<3>src((TText8*)"min");
@@ -42,4 +42,5 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tbufc8tochar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src;
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src ((TText8*)"#$%^&*()");
@@ -40,4 +40,5 @@
}
__UHEAP_MARKEND;
testResultXml("Test_tbufc8tochar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello");
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_recalling.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tochar_recalling.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src1((TText8*)"recalling");
@@ -48,4 +48,5 @@
des2=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tbufc8tochar_recalling");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tostring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tostring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s;
@@ -39,4 +39,5 @@
}
__UHEAP_MARK;
testResultXml("test_tbufc8tostring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
__UHEAP_MARK;
@@ -46,4 +46,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbufc8tostring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8tostring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8tostring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
string myString;
while(!err)
@@ -55,4 +55,5 @@
__UHEAP_RESET;
testResultXml("test_tbufc8tostring_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello World");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc8towchar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<300>src((TText8*)"Hello World @@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc8towchar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<5>src((TText8*)"Hello");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc8towchar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"");
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello World");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tbufc8towchar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello World");
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbufc8towstring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towstring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towstring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -48,4 +48,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tbufc8towstring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tbufc8towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tbufc8towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
wstring myString;
while(!err)
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tlit16tochar");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit16tochar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"qqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqpppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmkjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit16tochar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"123");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit16tochar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit16tochar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tlit16tochar");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit16tochar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
@@ -47,4 +47,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit16tochar_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,13 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
_LIT16(Kname,"tbuf16tochar");
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
while(!err)
{
int retval =ESuccess;
@@ -55,4 +55,5 @@
__UHEAP_RESET;
testResultXml("test_tlit16tochar_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tochar_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"\xAE");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit16tochar_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tostring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tostring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,7 +28,7 @@
TBuf <20>src;
src.Copy(Kname);
string str;
- int size=10;
+ //int size=10;
int retval =ESuccess;
retval= Tlit16ToString(src,str);
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,7 +28,7 @@
TBuf <20>src;
src.Copy(Kname);
string str;
- int size=10;
+ //int size=10;
int retval =ESuccess;
retval= Tlit16ToString(src,str);
@@ -44,4 +44,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tlit16tostring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,7 +28,7 @@
TBuf <20>src;
src.Copy(Kname);
string str;
- int size=10;
+ //int size=10;
int retval =ESuccess;
retval= Tlit16ToString(src,str);
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tlit16tochar");
@@ -44,4 +44,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit16towchar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"qqqqqqqqqqqqqqqqqqqjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj");
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"123");
@@ -44,4 +44,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit16towchar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"");
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tlit16tochar");
@@ -44,4 +44,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit16towchar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"tbuf16tochar");
--- a/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit16towchar_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT16(Kname,"\xAE");
@@ -44,4 +44,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit16towchar_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"tlit8aaaaaaaaaaaaaaaaa");
@@ -42,4 +42,5 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit8tochar_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapppppppppppppppppppppppppppppppppppppppaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaapppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppppp");
@@ -42,4 +42,5 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit8tochar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"min");
@@ -42,4 +42,5 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit8tochar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"");
@@ -42,4 +42,5 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit8tochar_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"tlit8aaaaaaaaaaaaaaaaa");
@@ -42,4 +42,5 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit8tochar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"tlit8");
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_recalling.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tochar_recalling.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"tlit8aaaaaaaaaaaaaaaaa");
@@ -48,4 +48,5 @@
des2 = NULL;
__UHEAP_MARKEND;
testResultXml("Test_tlit8tochar_recalling");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tostring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tostring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
__UHEAP_MARK;
@@ -46,4 +46,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tlit8tostring_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8tostring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8tostring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
string myString;
while(!err)
@@ -56,4 +56,5 @@
__UHEAP_RESET;
testResultXml("test_tlit8tostring_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@***************************************************************************************************************************************************************************************(((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((((@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit8towchar_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"min");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit8towchar_minsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"nodata");
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"nullcheck");
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tlit8towchar_nullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towchar_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
_LIT8(Kname,"positive");
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,7 +28,7 @@
TBuf8 <25>src;
src.Copy(Kname);
wstring str;
- int size=10;
+ //int size=10;
int retval =ESuccess;
retval= Tlitc8ToWstring(src,str);
@@ -44,4 +44,5 @@
}
__UHEAP_MARKEND;
testResultXml("Test_tlit8towstring_boundary1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -28,7 +28,7 @@
TBuf8 <20>src;
src.Copy(Kname);
wstring str;
- int size=10;
+ //int size=10;
int retval =ESuccess;
retval= Tlitc8ToWstring(src,str);
@@ -44,4 +44,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tlit8towstring_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towstring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towstring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -27,7 +27,7 @@
TBuf8 <20>src;
src.Copy(Kname);
wstring str;
- int size=10;
+ //int size=10;
int retval =ESuccess;
// int i=0;
// while (i<=1000)
@@ -49,4 +49,5 @@
}
__UHEAP_MARKEND;
testResultXml("Test_tlit8towstring_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tlit8towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tlit8towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
wstring myString;
while(!err)
@@ -55,4 +55,5 @@
__UHEAP_RESET;
testResultXml("test_tlit8towstring_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tochar_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tochar_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 3;
+ //int count = 3;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(3);
while(!err)
{
int retval =ESuccess;
@@ -54,4 +54,5 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_tptr16tochar_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("testing");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16tocharp_invalidsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<300> buf((unsigned short *)"pllllllllppppppppppp#####################################################################################");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16tocharp_maxsize");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<5> buf _L("hello");
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("");
@@ -43,4 +43,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16tocharp_nodata");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("testing");
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("testing");
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_ptrnullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_ptrnullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TPtr16 src ((unsigned short *)"",2,30);
@@ -42,4 +42,5 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16tocharp_ptrnullcheck");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tocharp_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("\xAE");
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16tostring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16tostring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -46,4 +46,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr16tostring_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("praveen");
@@ -42,4 +42,6 @@
delete[] des;
des = NULL;
__UHEAP_MARKEND;
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<300> buf((unsigned short *)"ppasdokppppppppppppppppppppppppppp###################################################################");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16towcharp_maxsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<5> buf _L("hello");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16towcharp_minsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16towcharp_nodata");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("testing");
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr16towcharp_nullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("praveen");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16towcharp_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_ptrnullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_ptrnullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("");
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towcharp_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<30> buf _L("\xAE");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr16towcharp_unicode");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr16towstring_boundary2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,13 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"hello") ;
__UHEAP_MARK;
TPtr16 src((unsigned short *)"My wide string",14, 30);
int retval=ESuccess;
- int size=30;
+ //int size=30;
retval= Tptr16ToWstring(src,des);
if((retval ==ESuccess) && (strncmp("My wide string",(const char*)des.c_str(),14) == 0 ))
@@ -40,4 +40,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr16towstring_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,13 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"hello") ;
__UHEAP_MARK;
TPtr16 src((unsigned short *)"My wide string",14, 30);
int retval=ESuccess;
- int size=2;
+ //int size=2;
retval= Tptr16ToWstring(src,des);
if(retval == ESuccess)
@@ -40,4 +40,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr16towstring_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,14 +19,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
wstring des((const wchar_t*)"hello") ;
TPtr16 src((unsigned short *)"",1, 30);
int retval=ESuccess;
- int size=30;
+ //int size=30;
// int i=0;
// while (i<=1000)
// {
@@ -47,4 +47,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr16towstring_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,13 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"hello") ;
__UHEAP_MARK;
TPtr16 src((unsigned short *)"My wide string",14, 30);
int retval=ESuccess;
- int size=30;
+ //int size=30;
retval= Tptr16ToWstring(src,des);
if(retval ==ESuccess)
@@ -40,4 +40,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr16towstring_positive2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr16towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
wstring myString;
while(!err)
@@ -55,4 +55,6 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_tptr16towstring_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tochar_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tochar_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
while(!err)
{
int retval =ESuccess;
@@ -55,4 +55,6 @@
__UHEAP_RESET;
testResultXml("test_tptr8tochar_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"testing");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptr8tocharp_invalidsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<300> buf((unsigned char*)"aqqqqqqqqxrestresraaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptr8tocharp_maxsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"min");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptr8tocharp_minsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptr8tocharp_nodata");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"testing");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptr8tocharp_nullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"testing");
@@ -48,4 +48,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptr8tocharp_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_ptrnullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tocharp_ptrnullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TPtr8 buf((unsigned char *)"",2,32);
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
string s;
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
__UHEAP_MARK;
@@ -30,7 +30,9 @@
// int i=0;
// while (i<=1000)
// {
- retval = Tptr8ToString(buf, s);
+ retval = Tptr8ToString(buf, s);
+ if(retval == ESuccess)
+ printf("conversion succeeded\n");
// i++;
// printf("%d\n",i);
// }
@@ -47,4 +49,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr8tostring_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8tostring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8tostring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
string myString;
while(!err)
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"invalidsize");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr8towcharp_invalidsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<300>src((TText8*)"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<5>src((TText8*)"Hello");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr8towcharp_minsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"");
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello");
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr8towcharp_nullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello");
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_ptrnullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towcharp_ptrnullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptr8towcharp_ptrnullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,13 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"hellohello") ;
__UHEAP_MARK;
TPtr8 src((unsigned char *)"My wide string",14, 30);
int retval=ESuccess;
- int size=30;
+ //int size=30;
retval= Tptr8ToWstring(src,des);
int tptrc_len = src.Length();
@@ -42,4 +42,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr8towstring_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -43,4 +43,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr8towstring_boundary2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,13 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"hellohello") ;
__UHEAP_MARK;
TPtr8 src((unsigned char *)"My wide string",14, 30);
int retval=ESuccess;
- int size=30;
+ //int size=30;
retval= Tptr8ToWstring(src,des);
if(retval ==ESuccess && wcscmp(L"My wide string",des.c_str()) == 0 )
@@ -40,4 +40,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr8towstring_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des;
__UHEAP_MARK;
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,14 +19,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
wstring des((const wchar_t*)"hellohello") ;
TPtr8 src((unsigned char *)"Hello World", 11, 35);
int retval=ESuccess;
- int size=30;
+ //int size=30;
// int i=0;
// while (i<=1000)
// {
@@ -47,4 +47,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr8towstring_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"hellohello") ;
__UHEAP_MARK;
@@ -39,4 +39,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptr8towstring_positive2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptr8towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
wstring myString;
while(!err)
@@ -55,4 +55,6 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_tptr8towstring_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tochar_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tochar_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
while(!err)
{
int retval =ESuccess;
@@ -56,4 +56,6 @@
__UHEAP_RESET;
testResultXml("test_tptrc16tochar_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("testing");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16tocharp_invalidsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<300> buf((unsigned short *)"praveenpppppppppppppppppppppppppppp###########################################################################");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16tocharp_maxsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<5> buf _L("hello");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16tocharp_minsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("");
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("testing");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16tocharp_nullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("testing");
@@ -47,4 +47,7 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16tocharp_positive");
+
+ return 0;
+
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_ptrnullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_ptrnullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TPtrC16 src ((unsigned short*)"",30);
@@ -42,4 +42,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16tocharp_ptrnullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tocharp_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("\xAE");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16t0Charp_unicode");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tostring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tostring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -44,4 +44,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16tostring_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -44,4 +44,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16tostring_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16tostring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16tostring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -44,4 +44,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16tostring_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("praveen");
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<300> buf((unsigned short *)"praveenppppppppppppppppp####################################################");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16towcharp_maxsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<50> buf _L("hello");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16towcharp_minsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("");
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("praveen");
@@ -42,4 +42,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16towcharp_nullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<20> buf _L("praveen");
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_ptrnullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_ptrnullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TPtrC16 src ((unsigned short*)"",30);
@@ -41,4 +41,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc16towcharp_ptrnullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towcharp_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC<30> buf _L("\xAE");
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"test");
__UHEAP_MARK;
TBufC16<30> buf _L("My wide string");
TPtrC16 src(buf);
int retval=ESuccess;
- int size=30;
+ //int size=30;
retval= Tptrc16ToWstring(src,des);
int tptrc_len = src.Length();
@@ -43,4 +43,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16towstring_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -44,4 +44,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16towstring_boundary2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"test");
__UHEAP_MARK;
TBufC16<30> buf _L("My wide string");
TPtrC16 src(buf);
int retval=ESuccess;
- int size=14;
+ //int size=14;
retval= Tptrc16ToWstring(src,des);
if(retval ==ESuccess && wcscmp(L"My wide string",des.c_str()) == 0 )
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16towstring_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"test");
__UHEAP_MARK;
TBufC16<30> buf _L("My wide string");
TPtrC16 src(buf);
int retval=ESuccess;
- int size=2;
+ //int size=2;
retval= Tptrc16ToWstring(src,des);
if(retval == ESuccess)
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16towstring_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -27,7 +27,7 @@
TBufC16<30> buf _L("My wide string");
TPtrC16 src(buf);
int retval=ESuccess;
- int size=30;
+ //int size=30;
// int i=0;
// while (i<=1000)
// {
@@ -48,4 +48,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16towstring_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"") ;
__UHEAP_MARK;
TBuf16<30> buf _L("");
TPtrC16 src(buf);
int retval=ESuccess;
- int size=2;
+ //int size=2;
retval= Tptrc16ToWstring(src,des);
if(retval ==EDescriptorNoData)
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc16towstring_positive2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc16towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
wstring myString;
while(!err)
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tochar_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tochar_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
while(!err)
{
int retval =ESuccess;
@@ -54,4 +54,6 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_tptrc8tochar_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"praveen");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptrc8tocharp_invalidsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<300> buf((unsigned char*)"aqqqqqqqqxrestresrexrtaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptrc8tocharp_maxsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"min");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptrc8tocharp_minsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptrc8tocharp_nodata");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"praveen");
@@ -43,4 +43,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptrc8tocharp_nullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20> buf((unsigned char*)"praveen");
@@ -48,4 +48,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptrc8tocharp_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_ptrnullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tocharp_ptrnullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TPtrC8 buf((unsigned char*)"",30);
@@ -42,4 +42,6 @@
des=NULL;
__UHEAP_MARKEND;
testResultXml("Test_tptrc8tocharp_ptrnullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tostring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tostring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -44,4 +44,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8tostring_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tostring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tostring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
string s;
__UHEAP_MARK;
@@ -39,4 +39,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8tostring_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tostring_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tostring_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -31,6 +31,10 @@
// while (i<=1000)
// {
retval = Tptrc8ToString(buf, s);
+ if(retval==ESuccess)
+ {
+ printf("Conversion successful\n");
+ }
// i++;
// printf("%d\n",i);
// }
@@ -47,4 +51,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8tostring_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8tostring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8tostring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
string myString;
while(!err)
@@ -54,4 +54,6 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_tptrc8tostring_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_invalidsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_invalidsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"invalidsize");
@@ -42,4 +42,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc8towcharp_invalidsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_maxsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_maxsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<300>src((TText8*)"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc8towcharp_maxsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_minsize.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_minsize.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<5>src((TText8*)"Hello");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc8towcharp_minsize");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_nodata.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_nodata.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc8towcharp_nodata");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_nullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_nullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc8towcharp_nullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"Hello");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc8towcharp_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_ptrnullcheck.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towcharp_ptrnullcheck.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
TBufC8<20>src((TText8*)"");
@@ -43,4 +43,6 @@
des = NULL;
__UHEAP_MARKEND;
testResultXml("test_tptrc8towcharp_ptrnullcheck");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"test") ;
__UHEAP_MARK;
TBufC8<30> buf((unsigned char*)"My wide string");
TPtrC8 src(buf);
int retval=ESuccess;
- int size=30;
+ //int size=30;
retval= Tptrc8ToWstring(src,des);
int tptrc_len = src.Length();
@@ -43,4 +43,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8towstring_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -44,4 +44,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8towstring_boundary2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des ((const wchar_t*)"mytest");
__UHEAP_MARK;
TBufC8<30> buf((unsigned char*)"My wide string");
TPtrC8 src(buf);
int retval=ESuccess;
- int size=14;
+ //int size=14;
retval= Tptrc8ToWstring(src,des);
if(retval ==ESuccess && wcscmp(L"My wide string",des.c_str()) == 0 )
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8towstring_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des((const wchar_t*)"test");
__UHEAP_MARK;
TBufC8<30> buf((unsigned char*)"My wide string");
TPtrC8 src(buf);
int retval=ESuccess;
- int size=2;
+ //int size=2;
retval= Tptrc8ToWstring(src,des);
if(retval == ESuccess)
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8towstring_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
{
@@ -47,4 +47,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8towstring_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,14 +20,14 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring des ;
__UHEAP_MARK;
TBufC8<30> buf((unsigned char*)"");
TPtrC8 src(buf);
int retval=ESuccess;
- int size=2;
+ //int size=2;
retval= Tptrc8ToWstring(src,des);
if(retval ==EDescriptorNoData)
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_tptrc8towstring_positive2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_tptrc8towstring_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
{
wstring myString;
while(!err)
@@ -56,4 +56,6 @@
__UHEAP_RESET;
testResultXml("test_tptrc8towstring_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -41,4 +41,6 @@
printf("wcharptotptr16 boundary1 Failed\n");
}
testResultXml("test_wcharptotptr16_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -42,4 +42,6 @@
printf("wcharptotptr16 boundar2 Failed\n");
}
testResultXml("test_wcharptotptr16_boundary2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_wcharptotptr16_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -40,4 +40,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_wcharptotptr16_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = NULL;
@@ -38,4 +38,6 @@
printf("wcharptotptr16 negative2 Failed\n");
}
testResultXml("test_wcharptotptr16_negative2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -38,4 +38,6 @@
printf("wcharptotptr16 positive Failed\n");
}
testResultXml("test_wcharptotptr16_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr16_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -40,4 +40,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_wcharptotptr16_positive2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -45,4 +45,6 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_wcharptotptr8_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,6 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_wcharptotptr8_boundary2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,6 @@
delete []temp;
__UHEAP_MARKEND;
testResultXml("test_wcharptotptr8_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,6 @@
temp = NULL;
__UHEAP_MARKEND;
testResultXml("test_wcharptotptr8_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = NULL;
@@ -39,4 +39,6 @@
printf("wcharptotptr8 negative2 Failed\n");
}
testResultXml("test_wcharptotptr8_negative2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -39,4 +39,6 @@
printf("wcharptotptr8 positive Failed\n");
}
testResultXml("test_wcharptotptr8_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptr8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"";
@@ -39,4 +39,6 @@
printf("wcharptotptr8 positive Failed\n");
}
testResultXml("test_wcharptotptr8_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -40,4 +40,6 @@
printf("wcharptotptrc16 boundary1 Failed\n");
}
testResultXml("test_wcharptotptrc16_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -41,4 +41,6 @@
printf("wcharptotptrc16 boundar2 Failed\n");
}
testResultXml("test_wcharptotptrc16_boundary2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -41,4 +41,6 @@
printf("wcharptotptrc16 content check Failed\n");
}
testResultXml("test_wcharptotptrc16_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = NULL;
@@ -37,4 +37,6 @@
printf("wcharptotptrc16 negative2 Failed\n");
}
testResultXml("test_wcharptotptrc16_negative2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -37,4 +37,6 @@
printf("wcharptotptrc16 positive Failed\n");
}
testResultXml("test_wcharptotptrc16_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc16_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"";
@@ -37,4 +37,6 @@
printf("wcharptotptrc16 positive Failed\n");
}
testResultXml("test_wcharptotptrc16_positive2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -42,4 +42,6 @@
}
delete []myptr;
testResultXml("test_wcharptotptrc8_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -43,4 +43,6 @@
}
free(myptr);
testResultXml("test_wcharptotptrc8_boundary2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -43,4 +43,6 @@
}
free(myptr);
testResultXml("test_wcharptotptrc8_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = NULL;
@@ -39,4 +39,6 @@
}
delete []myptr;
testResultXml("test_wcharptotptrc8_negative2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
@@ -39,4 +39,6 @@
}
free(myptr);
testResultXml("test_wcharptotptrc8_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wcharptotptrc8_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,6 @@
free(myptr);
__UHEAP_MARKEND;
testResultXml("test_wcharptotptrc8_positive2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartohbufc8_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartohbufc8_negative2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -47,4 +47,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartohbufc8_positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartohbufc8_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_positive5.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_positive5.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -45,4 +45,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartohbufc8_positive5");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohbufc8_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,12 +21,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
while(!err)
{
int retval =ESuccess;
@@ -59,4 +59,6 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_wchartohbufc8_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohufc16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohufc16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartohufc16_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohufc16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohufc16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartohufc16_negative2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartohufc16positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartohufc16positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartohufc16positive");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf16_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf16_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf16_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf16_negative2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf16_positive1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf16_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf16_positive2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -44,4 +44,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf8_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -46,4 +46,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf8_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf8_negative1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,6 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf8_negative2");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf8_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_positive2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartorbuf8_positive2.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wchartorbuf8_positive2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -41,4 +41,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf16_boundary1");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_boundary2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_boundary2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf16_content_check");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf16_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf16_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_boundary1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_boundary1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wchar_t* mywcharstring = L"Hello Widechar String";
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_content_check.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_content_check.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf8_content_check");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf8_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_negative3.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_negative3.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf8_negative3");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_negative4.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_negative4.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf8_negative4");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -49,4 +49,5 @@
temp = NULL;
__UHEAP_MARKEND;
testResultXml("test_WcharToTbuf8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_positive1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_positive1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf8_positive1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_positive3.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_positive3.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -39,4 +39,6 @@
}
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf8_positive3");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,12 +20,12 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 1;
+ //int count = 1;
bool err = false;
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(1);
while(!err)
{
int retval =ESuccess;
@@ -54,4 +54,6 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_wchartotbuf8_reliability");
+
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wchartotbuf8_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
__UHEAP_MARK;
int retval =ESuccess;
@@ -43,4 +43,5 @@
delete []temp;
__UHEAP_MARKEND;
testResultXml("test_wchartotbuf8_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -40,4 +40,5 @@
delete buf;
__UHEAP_MARKEND;
testResultXml("test_wstringtohbufc16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -40,4 +40,5 @@
delete buf;
__UHEAP_MARKEND;
testResultXml("test_wstringtohbufc16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W(L"Hello World");
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wstringtohbufc8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
__UHEAP_MARK;
@@ -47,4 +47,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtohbufc8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc8_positive_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc8_positive_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W(L"\xAE");
@@ -40,4 +40,5 @@
delete buf;
__UHEAP_MARKEND;
testResultXml("test_wstringtohbufc8_positive_unicode");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc8_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtohbufc8_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,13 +21,13 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 2;
+ //int count = 2;
bool err = false;
wstring myWstring(L"Hello");
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(2);
while(!err)
{
int retval =ESuccess;
@@ -59,4 +59,5 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_wstringtohbufc8_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtorbuf16_negative.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtorbuf16_negative.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str;
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtorbuf16_negative");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtorbuf16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtorbuf16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -21,7 +21,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -42,4 +42,5 @@
CleanupStack::PopAndDestroy(1);
__UHEAP_MARKEND;
testResultXml("test_wstringtorbuf16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtorbuf8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtorbuf8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"");
__UHEAP_MARK;
@@ -40,4 +40,5 @@
buf.Close();
__UHEAP_MARKEND;
testResultXml("test_wstringtorbuf8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtorbuf8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtorbuf8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -40,4 +40,5 @@
buf.Close();
__UHEAP_MARKEND;
testResultXml("test_wstringtorbuf8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_boundry.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_boundry.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf16_boundry");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_boundry1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_boundry1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello Worldddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddd");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf16_boundry1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_boundry2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_boundry2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf16_boundry2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str;
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf16_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_boundry.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_boundry.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W(L"Hello World");
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf8_boundry");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W(L"Hello World");
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_negative2.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_negative2.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W(L"");
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf8_negative2");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -19,7 +19,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
__UHEAP_MARK;
@@ -46,4 +46,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotbuf8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_reliability.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotbuf8_reliability.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,13 +20,13 @@
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
- int count = 1;
+ //int count = 1;
bool err = false;
wstring myWstring(L"Hello");
__UHEAP_MARK;
- __UHEAP_FAILNEXT(count);
+ __UHEAP_FAILNEXT(1);
while(!err)
{
int retval =ESuccess;
@@ -54,4 +54,5 @@
__UHEAP_MARKEND;
__UHEAP_RESET;
testResultXml("test_wstringtotbuf8_reliability");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptr16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptr16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotptr16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptr16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptr16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotptr16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptr8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptr8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W(L"Hello World");
@@ -42,4 +42,5 @@
temp=NULL;
__UHEAP_MARKEND;
testResultXml("test_wstringtotptr8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptr8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptr8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W(L"Hello World");
@@ -42,4 +42,5 @@
temp=NULL;
__UHEAP_MARKEND;
testResultXml("test_wstringtotptr8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc16_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc16_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str;
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotptrc16_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc16_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc16_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
wstring str(L"Hello World");
__UHEAP_MARK;
@@ -39,4 +39,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotptrc16_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc8_negative1.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc8_negative1.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W = L"hello";
@@ -40,4 +40,5 @@
}
__UHEAP_MARKEND;
testResultXml("test_wstringtotptrc8_negative1");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc8_positive.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc8_positive.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess;
wstring W(L"Hello World");
@@ -41,4 +41,5 @@
delete[] temp;
__UHEAP_MARKEND;
testResultXml("test_wstringtotptrc8_positive");
+ return 0;
}
--- a/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc8_positive_unicode.cpp Fri Apr 16 16:46:38 2010 +0300
+++ b/utilitylibraries/libutils/tsrc/src/test_wstringtotptrc8_positive_unicode.cpp Mon May 03 14:06:43 2010 +0300
@@ -20,7 +20,7 @@
#include "libutils.h"
#include"std_log_result.h"
#define LOG_FILENAME_LINE __FILE__, __LINE__
-void main()
+int main()
{
int retval =ESuccess, len = 0;
wstring W(L"\xAE");
@@ -28,6 +28,8 @@
TPtrC8 buf;
char *temp = new char [23];
retval = WstringToTptrc8(W, temp, buf);
+ if(retval == 0)
+ printf("Conversion successful\n");
wchar_t *wChar = new wchar_t[2];
len = wcslen(W.c_str());
@@ -48,4 +50,5 @@
temp = NULL;
__UHEAP_MARKEND;
testResultXml("test_wstringtotptrc8_positive_unicode");
+ return 0;
}