Switch to unified view

a/ohbuild.sh b/ohbuild.sh
...
...
208
     endif
208
     endif
209
     ifneq (,$(findstring i686,$(gcc_machine)))
209
     ifneq (,$(findstring i686,$(gcc_machine)))
210
       detected_openhome_architecture = x86
210
       detected_openhome_architecture = x86
211
EOF
211
EOF
212
212
213
    git checkout OpenHome/TestFramework/OptionParser.cpp
214
    patch -p1 << "EOF"
215
diff --git a/OpenHome/TestFramework/OptionParser.cpp b/OpenHome/TestFramework/OptionParser.cpp
216
index fe90233..644fc0b 100644
217
--- a/OpenHome/TestFramework/OptionParser.cpp
218
 b/OpenHome/TestFramework/OptionParser.cpp
219
@@ -282,7 +282,7 @@ void OptionParser::SetUsage(const TChar* aUsage)
220
 {
221
     delete iUsage;
222
     iUsage = NULL;
223
-    iUsage = new TChar[strlen(iUsage)];
224
    iUsage = new TChar[strlen(aUsage)];
225
     (void)strcpy(iUsage, aUsage);
226
 }
227
EOF
228
    
213
    cd  $topdir/ohTopology
229
    cd  $topdir/ohTopology
214
    # Wed Mar 22 11:15:28 2017 +0000
230
    # Wed Mar 22 11:15:28 2017 +0000
215
    git checkout cc09c09da4be8d3d04adae5b8f0daaf8450906a3 || exit 1
231
    git checkout cc09c09da4be8d3d04adae5b8f0daaf8450906a3 || exit 1
216
232
217
    cd  $topdir/ohSongcast
233
    cd  $topdir/ohSongcast