From: loylick Date: Mon, 8 Aug 2016 01:01:16 +0000 (+0300) Subject: Fixed linker error under VS2013, moved definition of format_version varible from... X-Git-Tag: v8.5.0-rc1~790^2~1 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63c3186d268d90696a34d9f15b17779377b7dc83;p=dealii.git Fixed linker error under VS2013, moved definition of format_version varible from a header to cc file. --- diff --git a/include/deal.II/base/data_out_base.h b/include/deal.II/base/data_out_base.h index 6ad27211e9..cc8d8020e6 100644 --- a/include/deal.II/base/data_out_base.h +++ b/include/deal.II/base/data_out_base.h @@ -1035,7 +1035,7 @@ namespace DataOutBase * this number is used only to verify that the format we are writing is * what the current readers and writers understand. */ - static const unsigned int format_version = 3; + static unsigned int format_version; }; /** diff --git a/source/base/data_out_base.cc b/source/base/data_out_base.cc index 8fd02d8dc3..4f15f9e178 100644 --- a/source/base/data_out_base.cc +++ b/source/base/data_out_base.cc @@ -1501,7 +1501,7 @@ namespace DataOutBase template const unsigned int Patch::space_dim; - const unsigned int Deal_II_IntermediateFlags::format_version; + unsigned int Deal_II_IntermediateFlags::format_version = 3;