Skip to content

Commit 2ed3e22

Browse files
committed
COMP: Include the iostream header where cout/cerr used
This change is necessary to be compatible with VTK 9.6 code as iostream was removed from a core header file as seen in Kitware/VTK@a95326a. See release note Kitware/VTK@7462a8b.
1 parent 5cee466 commit 2ed3e22

File tree

3 files changed

+18
-9
lines changed

3 files changed

+18
-9
lines changed

Testing/vtkAddonTestingUtilitiesTest1.cxx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
// vtkAddon includes
2222
#include "vtkAddonTestingUtilities.h"
2323

24+
// STD includes
25+
#include <iostream>
26+
2427
using namespace vtkAddonTestingUtilities;
2528

2629
//----------------------------------------------------------------------------

Testing/vtkParallelTransportTest1.cxx

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@
2626
#include <vtkNew.h>
2727
#include <vtkPointData.h>
2828

29+
// STD includes
30+
#include <iostream>
31+
2932
//----------------------------------------------------------------------------
3033
int vtkParallelTransportTest1(int vtkNotUsed(argc), char* vtkNotUsed(argv)[])
3134
{
@@ -87,7 +90,7 @@ int vtkParallelTransportTest1(int vtkNotUsed(argc), char* vtkNotUsed(argv)[])
8790
arc->GetOutput()->GetPoint(0, arcFirstPoint);
8891
double preferredNormalDirection[3] = { arcCenter[0] - arcFirstPoint[0], arcCenter[1] - arcFirstPoint[1], arcCenter[2] - arcFirstPoint[2] };
8992
parallelTransportFrame->SetPreferredInitialNormalVector(preferredNormalDirection);
90-
93+
9194
parallelTransportFrame->SetInputConnection(arc->GetOutputPort());
9295
parallelTransportFrame->Update();
9396

vtkTestingOutputWindow.h

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@
2222
#include "vtkOutputWindow.h"
2323
#include "vtkLoggingMacros.h" // for vtkInfoWithoutObjectMacro
2424

25+
// STD includes
26+
#include <iostream>
27+
2528
/// \brief VTK message output window class for automated testing.
2629
///
2730
/// This is a VTK output window class that is optimized to be used
@@ -51,7 +54,7 @@ class VTK_ADDON_EXPORT vtkTestingOutputWindow : public vtkOutputWindow
5154
/* Explicitly deleted functions belong in the public interface */
5255
vtkTestingOutputWindow(const vtkTestingOutputWindow&) = delete;
5356
void operator=(const vtkTestingOutputWindow&) = delete;
54-
57+
5558
// Gets a pointer to the singleton testing output window instance.
5659
// If the current VTK output window is not vtkTestingOutputWindow type then
5760
// it changes the output window to that.
@@ -67,26 +70,26 @@ class VTK_ADDON_EXPORT vtkTestingOutputWindow : public vtkOutputWindow
6770

6871
// Sets number of warning and error messages to zero
6972
virtual void ResetNumberOfLoggedMessages();
70-
73+
7174
// Number of any logged messages
7275
vtkGetMacro(NumberOfLoggedMessages, int);
7376
vtkSetMacro(NumberOfLoggedMessages, int);
74-
77+
7578
// Number of logged warning or generic warning messages
7679
vtkGetMacro(NumberOfLoggedWarningMessages, int);
7780
vtkSetMacro(NumberOfLoggedWarningMessages, int);
7881

7982
// Number of logged error messages
8083
vtkGetMacro(NumberOfLoggedErrorMessages, int);
8184
vtkSetMacro(NumberOfLoggedErrorMessages, int);
82-
85+
8386
// Returns the sum of warning and error messages logged
8487
int GetNumberOfLoggedWarningErrorMessages();
85-
88+
8689
protected:
87-
vtkTestingOutputWindow();
88-
~vtkTestingOutputWindow() override;
89-
90+
vtkTestingOutputWindow();
91+
~vtkTestingOutputWindow() override;
92+
9093
int NumberOfLoggedWarningMessages{0};
9194
int NumberOfLoggedErrorMessages{0};
9295
int NumberOfLoggedMessages{0};

0 commit comments

Comments
 (0)