Skip to content
Snippets Groups Projects
Commit efb59ede authored by Andrew Maclean's avatar Andrew Maclean
Browse files

Merge branch 'Fix_ISO_C++_Warning' into 'master'

Fix iso c++ warning

See merge request !72
parents 895c380a 0a82750a
No related branches found
No related tags found
1 merge request!72Fix iso c++ warning
......@@ -61,9 +61,9 @@ int main(int, char*[])
// For dotted line, the line type can be from 2 to 5 for different dash/dot
// patterns (see enum in vtkPen containing DASH_LINE, value 2):
#ifndef WIN32
line->GetPen()->SetLineType(vtkPen::DASH_LINE);
#endif
// #ifndef WIN32
// line->GetPen()->SetLineType(vtkPen::DASH_LINE);
// #endif
// (ifdef-ed out on Windows because DASH_LINE does not work on Windows
// machines with built-in Intel HD graphics card...)
......
......@@ -17,8 +17,8 @@ namespace {
constexpr int NUM_ITEMS = 5;
constexpr int data[] = {77938, 9109, 2070, 12806, 19514};
// constexpr int data[] = {200,200,200,200,200};
constexpr char* labels[] = {"Books", "New and Popular", "Periodical",
"Audiobook", "Video"};
std::string labels[] = {"Books", "New and Popular", "Periodical", "Audiobook",
"Video"};
} // namespace
int main(int, char*[])
......
#include <vtkRenderer.h>
#include <vtkRenderWindow.h>
#include <vtkSmartPointer.h>
#include <vtkChartXY.h>
#include <vtkPlot.h>
#include <vtkAxis.h>
#include <vtkPlotStacked.h>
#include <vtkChartXY.h>
#include <vtkColor.h>
#include <vtkColorSeries.h>
#include <vtkTable.h>
#include <vtkIntArray.h>
#include <vtkDoubleArray.h>
#include <vtkStringArray.h>
#include <vtkContextView.h>
#include <vtkContextScene.h>
#include <vtkRenderWindowInteractor.h>
#include <vtkContextView.h>
#include <vtkDoubleArray.h>
#include <vtkIntArray.h>
#include <vtkNamedColors.h>
#include <vtkNew.h>
#include <vtkPlot.h>
#include <vtkPlotStacked.h>
#include <vtkRenderWindow.h>
#include <vtkRenderWindowInteractor.h>
#include <vtkRenderer.h>
#include <vtkStringArray.h>
#include <vtkTable.h>
namespace {
// Monthly checkout data
constexpr char *month_labels[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
std::string month_labels[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
constexpr int book[] = {5675, 5902, 6388, 5990, 5575, 7393,
9878, 8082, 6417, 5946, 5526, 5166};
constexpr int new_popular[] = {701, 687, 736, 696, 750, 814,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment