From: bangerth Date: Tue, 19 Jun 2012 11:25:47 +0000 (+0000) Subject: More patches for MS Windows. X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=55de4bcbb595e9c1e252a1923caf2deaeeb69509;p=dealii-svn.git More patches for MS Windows. git-svn-id: https://svn.dealii.org/trunk@25636 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/configure.in b/deal.II/configure.in index 03b4407238..e80fe5e008 100644 --- a/deal.II/configure.in +++ b/deal.II/configure.in @@ -850,6 +850,16 @@ AH_BOTTOM( # define DEAL_II_MSVC #endif +/** + * Using pthreads under windows as a non-static library requires the following + * preprocessor switch to be undefined. + */ +#ifdef DEAL_II_MSVC +# if defined(PTW32_STATIC_LIB) +# undef PTW32_STATIC_LIB +# endif +#endif + /* * There is an annoying problem in the Trilinos header ml_config.h: It * #define's HAVE_INTTYPES_H but doesn't give the symbol a value. This diff --git a/deal.II/include/deal.II/base/config.h.in b/deal.II/include/deal.II/base/config.h.in index d7370e47be..68f063e993 100644 --- a/deal.II/include/deal.II/base/config.h.in +++ b/deal.II/include/deal.II/base/config.h.in @@ -642,6 +642,16 @@ # define DEAL_II_MSVC #endif +/** + * Using pthreads under windows as a non-static library requires the following + * preprocessor switch to be undefined. + */ +#ifdef DEAL_II_MSVC +# if defined(PTW32_STATIC_LIB) +# undef PTW32_STATIC_LIB +# endif +#endif + /* * There is an annoying problem in the Trilinos header ml_config.h: It * #define's HAVE_INTTYPES_H but doesn't give the symbol a value. This diff --git a/deal.II/source/base/logstream.cc b/deal.II/source/base/logstream.cc index ba6854c99f..94729e15f6 100644 --- a/deal.II/source/base/logstream.cc +++ b/deal.II/source/base/logstream.cc @@ -338,6 +338,7 @@ LogStream::print_line_head() } } #else +//TODO[BG]: Do something useful here double utime = 0.; #endif diff --git a/deal.II/source/base/timer.cc b/deal.II/source/base/timer.cc index 3947d79211..86ad311fb0 100644 --- a/deal.II/source/base/timer.cc +++ b/deal.II/source/base/timer.cc @@ -97,7 +97,7 @@ namespace &exitTime, &sysTime, &cpuTime)) { return (double)(((unsigned long long)cpuTime.dwHighDateTime << 32) - | cpuTime.dwLowDateTime) / 10e6; + | cpuTime.dwLowDateTime) / 1e6; } return 0; } @@ -233,6 +233,7 @@ double Timer::wall_time () const if (running) { #ifdef DEAL_II_MSVC +//TODO[BG]: Do something useful here return 0; #else struct timeval wall_timer; diff --git a/deal.II/source/hp/dof_handler.cc b/deal.II/source/hp/dof_handler.cc index 09b2fbef5d..2548bb3516 100644 --- a/deal.II/source/hp/dof_handler.cc +++ b/deal.II/source/hp/dof_handler.cc @@ -323,7 +323,7 @@ namespace internal template static unsigned int - distribute_dofs_on_cell (const typename DoFHandler<1,spacedim>::active_cell_iterator &cell, + distribute_dofs_on_cell (const typename dealii::hp::DoFHandler<1,spacedim>::active_cell_iterator &cell, unsigned int next_free_dof) { const unsigned int dim = 1; @@ -368,7 +368,7 @@ namespace internal template static unsigned int - distribute_dofs_on_cell (const typename DoFHandler<2,spacedim>::active_cell_iterator &cell, + distribute_dofs_on_cell (const typename dealii::hp::DoFHandler<2,spacedim>::active_cell_iterator &cell, unsigned int next_free_dof) { const unsigned int dim = 2; @@ -431,7 +431,7 @@ namespace internal template static unsigned int - distribute_dofs_on_cell (const typename DoFHandler<3,spacedim>::active_cell_iterator &cell, + distribute_dofs_on_cell (const typename dealii::hp::DoFHandler<3,spacedim>::active_cell_iterator &cell, unsigned int next_free_dof) { const unsigned int dim = 3;