From b7e9ea073a6d98f95c0df5f7ed6bdbf87bb7f4a9 Mon Sep 17 00:00:00 2001 From: cxl Date: Fri, 8 Dec 2017 08:34:54 +0000 Subject: [PATCH] .tutorial git-svn-id: svn://ultimatepp.org/upp/trunk@11530 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- tutorial/CoreTutorial/SpecialStream.cpp | 6 +++--- tutorial/CoreTutorial/tutorial2.cpp | 14 ++++++-------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/tutorial/CoreTutorial/SpecialStream.cpp b/tutorial/CoreTutorial/SpecialStream.cpp index 607b5b0f8..6ec3c3963 100644 --- a/tutorial/CoreTutorial/SpecialStream.cpp +++ b/tutorial/CoreTutorial/SpecialStream.cpp @@ -36,7 +36,7 @@ void SpecialStream() os << "This is a test " << 12345; os.Close(); - /// `TeeStream` send output data to two separate streams: + /// `TeeStream` sends output data to two separate streams: StringStream ss1; StringStream ss2; @@ -49,9 +49,9 @@ void SpecialStream() /// `MemReadStream` can be used to convert read-only memory block to stream data: static const char s[] = "Some line\nAnother line"; - MemReadStream ms(s, sizeof(os)); + MemReadStream ms(s, sizeof(s) - 1); while(!ms.IsEof()) - DUMP(ms.GetLine()); + DUMPHEX(ms.GetLine()); /// } diff --git a/tutorial/CoreTutorial/tutorial2.cpp b/tutorial/CoreTutorial/tutorial2.cpp index 51303c2c7..6142e84f5 100644 --- a/tutorial/CoreTutorial/tutorial2.cpp +++ b/tutorial/CoreTutorial/tutorial2.cpp @@ -2,7 +2,6 @@ GUI_APP_MAIN { -#if 0 SECTION("Basics"); DO(Logging); DO(StringTutorial); @@ -13,6 +12,11 @@ GUI_APP_MAIN DO(CombineHashTutorial); DO(ComparableTutorial); + SECTION("Streams"); + DO(Stream); + DO(SpecialStream); + DO(Serialize); + SECTION("Array containers"); DO(Vector1); DO(Vector2); @@ -30,7 +34,7 @@ GUI_APP_MAIN DO(SortedMap); DO(TupleTutorial); - SECTION("Ranges and algoritims"); + SECTION("Ranges and algorithms"); DO(Range); DO(Algo); DO(Sorting); @@ -53,12 +57,6 @@ GUI_APP_MAIN DO(AsyncTutorial); DO(CoPartitionTutorial); DO(CoAlgoTutorial); -#endif - - SECTION("Streams"); - DO(Stream); - DO(SpecialStream); - DO(Serialize); MakeTutorial(); }