Skip to content

Commit ab50889

Browse files
committed
Fix some compiler warnings
1 parent bcb11cd commit ab50889

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

Builds/VisualStudio2013/open-ephys.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@
190190
<AssemblerListingLocation>$(IntDir)\</AssemblerListingLocation>
191191
<ObjectFileName>$(IntDir)\</ObjectFileName>
192192
<ProgramDataBaseFileName>$(IntDir)\</ProgramDataBaseFileName>
193-
<WarningLevel>Level4</WarningLevel>
193+
<WarningLevel>Level2</WarningLevel>
194194
<SuppressStartupBanner>true</SuppressStartupBanner>
195195
<MultiProcessorCompilation>true</MultiProcessorCompilation>
196196
<FloatingPointModel>Fast</FloatingPointModel>

Source/CoreServices.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "../JuceLibraryCode/JuceHeader.h"
2828

2929
class GenericEditor;
30-
class SpikeObject;
30+
struct SpikeObject;
3131
class GenericProcessor;
3232
struct SpikeRecordInfo;
3333

Source/Processors/FileReader/KwikFileSource.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,13 +126,13 @@ void KWIKFileSource::fillRecordInfo()
126126
{
127127
}
128128

129-
for (int i = 0; i < dims[1]; i++)
129+
for (int j = 0; j < dims[1]; j++)
130130
{
131131
RecordedChannelInfo c;
132-
c.name = "CH" + String(i);
132+
c.name = "CH" + String(j);
133133

134134
if (foundBitVoltArray)
135-
c.bitVolts = bitVoltArray[i];
135+
c.bitVolts = bitVoltArray[j];
136136
else
137137
c.bitVolts = bitVolts;
138138

Source/Processors/PSTH/PeriStimulusTimeHistogramEditor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1301,8 +1301,8 @@ void GenericPlot::resetAxes()
13011301
tcb->getElectrodeConditionRange(electrodeID, subID, trial_xmin, trial_xmax);
13021302

13031303
std::vector<XYline> lines = tcb->getElectrodeConditionCurves(electrodeID, subID);
1304-
float xmin,xmax;
1305-
double ymin,ymax;
1304+
float xmin=0,xmax=0;
1305+
double ymin=0,ymax=0;
13061306
float highestY=-1e10,lowestY=1e10;
13071307
for (int k=0; k<lines.size(); k++)
13081308
{

Source/Processors/RecordNode/RecordEngine.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ struct SpikeRecordInfo
5050
int recordIndex;
5151
};
5252

53-
class EngineParameter;
53+
struct EngineParameter;
5454
class RecordNode;
5555
class RecordEngineManager;
5656

Source/UI/GraphViewer.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ GraphNode* GraphViewer::getNodeForEditor(GenericEditor* editor)
206206
int GraphViewer::nodesAtLevel(int level)
207207
{
208208

209-
int numNodes;
209+
int numNodes=0;
210210

211211
for (int i = 0; i < availableNodes.size(); i++)
212212
{

0 commit comments

Comments
 (0)