Skip to content

Commit e04ee1a

Browse files
committed
Mac compile problem (python/boost name collision)
1 parent b8f7724 commit e04ee1a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

src/Dataflow/Engine/Python/Tests/NetworkEditorPythonAPITests.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
#include <Modules/Factory/HardCodedModuleFactory.h>
3131
#include <Dataflow/Engine/Controller/NetworkEditorController.h>
3232
#include <Dataflow/Network/ConnectionId.h>
33-
#include <Core/Python/PythonInterpreter.h>
3433
#include <Modules/Legacy/Fields/CreateLatVol.h>
3534
#include <Dataflow/State/SimpleMapModuleState.h>
3635
#include <Dataflow/Engine/Scheduler/DesktopExecutionStrategyFactory.h>
36+
#include <Core/Python/PythonInterpreter.h>
3737

3838
using namespace SCIRun;
3939
using namespace Core;
@@ -144,5 +144,5 @@ TEST_F(PythonControllerFunctionalTests, DISABLED_CanExecuteNetwork)
144144
PythonInterpreter::Instance().run_string("executeAll()");
145145
// boost::this_thread::sleep(boost::posix_time::milliseconds(500));
146146
ASSERT_TRUE(controller.getNetwork()->module(0)->executionState().currentState() == ModuleExecutionState::Completed);
147-
//TODO: how do i assert on
148-
}
147+
//TODO: how do i assert on
148+
}

0 commit comments

Comments
 (0)