Windows compilation 36/19636/1
Antoine ELIAS [Sat, 23 Dec 2017 17:18:02 +0000 (18:18 +0100)]
Change-Id: Ie9172b063a3786232ca1c7a8713149365d42cabb

scilab/modules/scicos/src/cpp/view_scilab/BlockAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/CprAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/DiagramAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/GraphicsAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/LinkAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ModelAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ParamsAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/ScsAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/StateAdapter.cpp
scilab/modules/scicos/src/cpp/view_scilab/TextAdapter.cpp

index 2f90940..dc44c52 100644 (file)
@@ -173,7 +173,10 @@ link_indices_t getPortEnd(const Controller& controller, org_scilab_modules_scico
 
 } /* namespace */
 
-template<> property<BlockAdapter>::props_t property<BlockAdapter>::fields = property<BlockAdapter>::props_t();
+#ifndef _MSC_VER
+template<>
+#endif
+property<BlockAdapter>::props_t property<BlockAdapter>::fields = property<BlockAdapter>::props_t();
 
 BlockAdapter::BlockAdapter(const Controller& c, org_scilab_modules_scicos::model::Block* adaptee) :
     BaseAdapter<BlockAdapter, org_scilab_modules_scicos::model::Block>(c, adaptee),
index b4bb0fa..7b6902f 100644 (file)
@@ -47,7 +47,10 @@ struct dummy_property
 
 } /* namespace */
 
-template<> property<CprAdapter>::props_t property<CprAdapter>::fields = property<CprAdapter>::props_t();
+#ifndef _MSC_VER
+template<>
+#endif
+property<CprAdapter>::props_t property<CprAdapter>::fields = property<CprAdapter>::props_t();
 static void initialize_fields()
 {
     if (property<CprAdapter>::properties_have_not_been_set())
index ed8c232..1e140eb 100644 (file)
@@ -502,8 +502,10 @@ struct contrib
 
 } /* namespace */
 
-template<> property<DiagramAdapter>::props_t property<DiagramAdapter>::fields = property<DiagramAdapter>::props_t();
-
+#ifndef _MSC_VER
+template<>
+#endif
+property<DiagramAdapter>::props_t property<DiagramAdapter>::fields = property<DiagramAdapter>::props_t();
 DiagramAdapter::DiagramAdapter(const Controller& c, org_scilab_modules_scicos::model::BaseObject* adaptee) :
     BaseAdapter<DiagramAdapter, org_scilab_modules_scicos::model::BaseObject>(c, adaptee),
     contrib_content(default_value<types::List>())
index f22638a..95266ce 100644 (file)
@@ -608,7 +608,10 @@ struct style
 
 } /* namespace */
 
-template<> property<GraphicsAdapter>::props_t property<GraphicsAdapter>::fields = property<GraphicsAdapter>::props_t();
+#ifndef _MSC_VER
+template<>
+#endif
+property<GraphicsAdapter>::props_t property<GraphicsAdapter>::fields = property<GraphicsAdapter>::props_t();
 static void initialize_fields()
 {
     if (property<GraphicsAdapter>::properties_have_not_been_set())
index 93762bc..46f6536 100644 (file)
@@ -875,8 +875,10 @@ struct to
 
 } /* namespace */
 
-template<> property<LinkAdapter>::props_t property<LinkAdapter>::fields = property<LinkAdapter>::props_t();
-
+#ifndef _MSC_VER
+template<>
+#endif
+property<LinkAdapter>::props_t property<LinkAdapter>::fields = property<LinkAdapter>::props_t();
 LinkAdapter::LinkAdapter(const Controller& c, org_scilab_modules_scicos::model::Link* adaptee) :
     BaseAdapter<LinkAdapter, org_scilab_modules_scicos::model::Link>(c, adaptee)
 {
index 261e06a..d18f3aa 100644 (file)
@@ -1370,7 +1370,10 @@ struct uid
 
 } /* namespace */
 
-template<> property<ModelAdapter>::props_t property<ModelAdapter>::fields = property<ModelAdapter>::props_t();
+#ifndef _MSC_VER
+template<>
+#endif
+property<ModelAdapter>::props_t property<ModelAdapter>::fields = property<ModelAdapter>::props_t();
 static void initialize_fields()
 {
     if (property<ModelAdapter>::properties_have_not_been_set())
index 007ea3b..c04015d 100644 (file)
@@ -449,7 +449,10 @@ struct doc
 
 } /* namespace */
 
-template<> property<ParamsAdapter>::props_t property<ParamsAdapter>::fields = property<ParamsAdapter>::props_t();
+#ifndef _MSC_VER
+template<>
+#endif
+property<ParamsAdapter>::props_t property<ParamsAdapter>::fields = property<ParamsAdapter>::props_t();
 static void initialize_fields()
 {
     if (property<ParamsAdapter>::properties_have_not_been_set())
index 827caca..2297856 100644 (file)
@@ -32,8 +32,10 @@ namespace
 
 } /* namespace */
 
-template<> property<ScsAdapter>::props_t property<ScsAdapter>::fields = property<ScsAdapter>::props_t();
-
+#ifndef _MSC_VER
+template<>
+#endif
+property<ScsAdapter>::props_t property<ScsAdapter>::fields = property<ScsAdapter>::props_t();
 ScsAdapter::ScsAdapter(const Controller& c, org_scilab_modules_scicos::model::Diagram* adaptee) :
     BaseAdapter<ScsAdapter, org_scilab_modules_scicos::model::Diagram>(c, adaptee)
 {
index 42d93a7..1989d9e 100644 (file)
@@ -47,7 +47,10 @@ struct dummy_property
 
 } /* namespace */
 
-template<> property<StateAdapter>::props_t property<StateAdapter>::fields = property<StateAdapter>::props_t();
+#ifndef _MSC_VER
+template<>
+#endif
+property<StateAdapter>::props_t property<StateAdapter>::fields = property<StateAdapter>::props_t();
 static void initialize_fields()
 {
     if (property<StateAdapter>::properties_have_not_been_set())
index 9d734b2..e7105ee 100644 (file)
@@ -272,8 +272,10 @@ struct gui
 
 } /* namespace */
 
-template<> property<TextAdapter>::props_t property<TextAdapter>::fields = property<TextAdapter>::props_t();
-
+#ifndef _MSC_VER
+template<>
+#endif
+property<TextAdapter>::props_t property<TextAdapter>::fields = property<TextAdapter>::props_t();
 TextAdapter::TextAdapter(const Controller& c, org_scilab_modules_scicos::model::Annotation* adaptee) :
     BaseAdapter<TextAdapter, org_scilab_modules_scicos::model::Annotation>(c, adaptee)
 {