Commit a567c73e authored by ledig's avatar ledig
Browse files

FIXED compile with MSVC

parent 2acf7cd1
......@@ -55,7 +55,7 @@ WQt4Gui::~WQt4Gui()
#ifdef _WIN32
// need this on windows to make it link correctly.
const unsigned int boost::program_options::options_description::m_default_line_length = 2048;
//const unsigned int boost::program_options::options_description::m_default_line_length = 2048;
#endif
bool WQt4Gui::parseOptions()
......
......@@ -25,8 +25,8 @@
#include <string>
#include <vector>
#include "WModuleContainer.h"
#include "WModule.h"
#include "WModuleContainer.h"
#include "WModuleFactory.h"
#include "WBatchLoader.h"
......
......@@ -245,8 +245,13 @@ std::pair< wmath::WPosition, wmath::WPosition > WMVoxelizer::createBoundingBox(
{
for( int x = 0; x < 3; ++x )
{
#ifdef _WIN32
fll[x] = min( fiber[i][x], fll[x] );
bur[x] = max( fiber[i][x], bur[x] );
#else
fll[x] = std::min( fiber[i][x], fll[x] );
bur[x] = std::max( fiber[i][x], bur[x] );
#endif
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment