[Algorhythmics-svn] SF.net SVN: algorhythmics:[267] algorhythmicSorting/ofAlgorhythmicSorting

[<mc...@us...>]

Revision: 267
          http://algorhythmics.svn.sourceforge.net/algorhythmics/?rev=267&view=rev
Author:   mchinen
Date:     2011-01-13 20:58:23 +0000 (Thu, 13 Jan 2011)

Log Message:
-----------
fix build on windows

Modified Paths:
--------------
    algorhythmicSorting/ofAlgorhythmicSorting/AlgorhythmicSorting.vcproj
    algorhythmicSorting/ofAlgorhythmicSorting/src/AlgorhythmicAudioIO.h
    algorhythmicSorting/ofAlgorhythmicSorting/src/sorthelp.cpp
    algorhythmicSorting/ofAlgorhythmicSorting/src/testApp.cpp

Modified: algorhythmicSorting/ofAlgorhythmicSorting/AlgorhythmicSorting.vcproj
===================================================================
--- algorhythmicSorting/ofAlgorhythmicSorting/AlgorhythmicSorting.vcproj	2011-01-09 19:54:25 UTC (rev 266)
+++ algorhythmicSorting/ofAlgorhythmicSorting/AlgorhythmicSorting.vcproj	2011-01-13 20:58:23 UTC (rev 267)
@@ -247,10 +247,14 @@
 				>
 			</File>
 			<File
-				RelativePath=".\src\insert.cpp"
+				RelativePath=".\src\ImageWriterSquaresView.cpp"
 				>
 			</File>
 			<File
+				RelativePath=".\src\ImageWriterSquaresView.h"
+				>
+			</File>
+			<File
 				RelativePath=".\src\main.cpp"
 				>
 			</File>

Modified: algorhythmicSorting/ofAlgorhythmicSorting/src/AlgorhythmicAudioIO.h
===================================================================
--- algorhythmicSorting/ofAlgorhythmicSorting/src/AlgorhythmicAudioIO.h	2011-01-09 19:54:25 UTC (rev 266)
+++ algorhythmicSorting/ofAlgorhythmicSorting/src/AlgorhythmicAudioIO.h	2011-01-13 20:58:23 UTC (rev 267)
@@ -86,7 +86,7 @@
    void SetAIndex(int a)      { m_playIndexA        = a; }
    void SetBIndex(int b)      { m_playIndexB        = b; }
    int  CurrentIndex()        { return m_currentIndex; }
-   int  RemoveCurrentIndex()  { m_currentIndex = -1; }
+   void  RemoveCurrentIndex()  { m_currentIndex = -1; }
    void ComputeCurrentIndex(int localIndex);
   protected:
    //private constructor - Singleton.

Modified: algorhythmicSorting/ofAlgorhythmicSorting/src/sorthelp.cpp
===================================================================
--- algorhythmicSorting/ofAlgorhythmicSorting/src/sorthelp.cpp	2011-01-09 19:54:25 UTC (rev 266)
+++ algorhythmicSorting/ofAlgorhythmicSorting/src/sorthelp.cpp	2011-01-13 20:58:23 UTC (rev 267)
@@ -6,6 +6,8 @@
 #else
 #include <unistd.h>
 #endif
+
+#include <algorithm>
 #include "AlgorhythmicAudioIO.h"
 #include "handyfuncs.h"
 

Modified: algorhythmicSorting/ofAlgorhythmicSorting/src/testApp.cpp
===================================================================
--- algorhythmicSorting/ofAlgorhythmicSorting/src/testApp.cpp	2011-01-09 19:54:25 UTC (rev 266)
+++ algorhythmicSorting/ofAlgorhythmicSorting/src/testApp.cpp	2011-01-13 20:58:23 UTC (rev 267)
@@ -104,7 +104,7 @@
 	gui.addSlider("Array Size", arraysize, 2, 200); 
     
     
-    string arraytypestrings[eNumSortAlgorithms];
+    string arraytypestrings[eNumArrayFillTypes];
     
    for(int i = 0;i< eNumArrayFillTypes;i++)
       arraytypestrings[i] = arrayfillstrings[i];


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.