X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPlugins_Instances%2FBaseObjects_extra.cxx;h=80c0319977f421bef8334c49f8597aa971deca96;hb=17f052241f7ab67015e3a34f7564da17da8a0e07;hp=7b81bc77d1d5b0648cbff794e3cafff2e977291a;hpb=96e980b8c0d2829d7c266313228d573c42f7b360;p=cpPlugins.git

diff --git a/lib/cpPlugins_Instances/BaseObjects_extra.cxx b/lib/cpPlugins_Instances/BaseObjects_extra.cxx
index 7b81bc7..80c0319 100644
--- a/lib/cpPlugins_Instances/BaseObjects_extra.cxx
+++ b/lib/cpPlugins_Instances/BaseObjects_extra.cxx
@@ -1,6 +1,6 @@
 #include <cpPlugins_Instances_BaseObjects_Export.h>
 #include <cpPlugins_Instances/BaseObjects.h>
-
+#include <cpPlugins_Config.h>
 
 #include <itkImageRegion.h>
 #include <itkFixedArray.h>
@@ -14,34 +14,33 @@
 #include <itkVariableLengthVector.hxx>
 #include <itkVector.hxx>
 
-
 // -------------------------------------------------------------------------
-#define cpPlugins_Instances_BaseObjects_extra_SimpleArray( V, D )                   \
-   template cpPlugins_Instances_BaseObjects_EXPORT                                     \
-   std::ostream& itk::operator<< < D >(                               \
-   std::ostream& a, V< D > const& b                                   \
-   )
+#define cpPlugins_Instances_BaseObjects_extra_SimpleArray( V, D )       \
+  template cpPlugins_Instances_BaseObjects_EXPORT                       \
+  std::ostream& itk::operator<< < D >(                                  \
+    std::ostream& a, V< D > const& b                                    \
+    )
 
-   cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 1 );
-   cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 2 );
-   cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 3 );
-   cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 4 );
+cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 1 );
+cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 2 );
+cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 3 );
+cpPlugins_Instances_BaseObjects_extra_SimpleArray( itk::ImageRegion, 4 );
 
 // -------------------------------------------------------------------------
-#define cpPlugins_Instances_BaseObjects_extra_Array( V, T, D )                  \
-  template cpPlugins_Instances_BaseObjects_EXPORT                               \
-  std::ostream& itk::operator<< < T, D >(                             \
-    std::ostream& a, V< T, D > const& b                               \
+#define cpPlugins_Instances_BaseObjects_extra_Array( V, T, D )          \
+  template cpPlugins_Instances_BaseObjects_EXPORT                       \
+  std::ostream& itk::operator<< < T, D >(                               \
+    std::ostream& a, V< T, D > const& b                                 \
     )
 
 #define cpPlugins_Instances_BaseObjects_extra_Array_AllScalars( V, D ) \
   cpPlugins_Instances_BaseObjects_extra_Array( V, float, D );          \
   cpPlugins_Instances_BaseObjects_extra_Array( V, double, D )
 
-#define cpPlugins_Instances_BaseObjects_extra_Array_AllScalars_AllDims( V )    \
-  cpPlugins_Instances_BaseObjects_extra_Array_AllScalars( V, 1 );              \
-  cpPlugins_Instances_BaseObjects_extra_Array_AllScalars( V, 2 );              \
-  cpPlugins_Instances_BaseObjects_extra_Array_AllScalars( V, 3 );              \
+#define cpPlugins_Instances_BaseObjects_extra_Array_AllScalars_AllDims( V ) \
+  cpPlugins_Instances_BaseObjects_extra_Array_AllScalars( V, 1 );       \
+  cpPlugins_Instances_BaseObjects_extra_Array_AllScalars( V, 2 );       \
+  cpPlugins_Instances_BaseObjects_extra_Array_AllScalars( V, 3 );       \
   cpPlugins_Instances_BaseObjects_extra_Array_AllScalars( V, 4 )
 
 cpPlugins_Instances_BaseObjects_extra_Array_AllScalars_AllDims( itk::FixedArray );
@@ -49,21 +48,23 @@ cpPlugins_Instances_BaseObjects_extra_Array_AllScalars_AllDims( itk::Point );
 cpPlugins_Instances_BaseObjects_extra_Array_AllScalars_AllDims( itk::Vector );
 
 // -------------------------------------------------------------------------
-/* TODO
-   #define cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( T, P, Q ) \
-   template cpPlugins_Instances_BaseObjects_EXPORT void itk::VariableLengthVector< T >:: \
-   SetSize                                                              \
-   < itk::VariableLengthVector< T >::P, itk::VariableLengthVector< T >::Q > \
-   (                                                                    \
-   unsigned int,                                                        \
-   itk::VariableLengthVector< T >::P,                                   \
-   itk::VariableLengthVector< T >::Q                                    \
-   )
+#ifndef cpPlugins_SYS_MACOS
+
+#define cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( T, P, Q ) \
+  template cpPlugins_Instances_BaseObjects_EXPORT void itk::VariableLengthVector< T >:: \
+  SetSize                                                               \
+  < itk::VariableLengthVector< T >::P, itk::VariableLengthVector< T >::Q > \
+  (                                                                     \
+    unsigned int,                                                       \
+    itk::VariableLengthVector< T >::P,                                  \
+    itk::VariableLengthVector< T >::Q                                   \
+    )
+
+cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( float, AlwaysReallocate, KeepOldValues );
+cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( float, ShrinkToFit, KeepOldValues );
+cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( double, AlwaysReallocate, KeepOldValues );
+cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( double, ShrinkToFit, KeepOldValues );
 
-   cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( float, AlwaysReallocate, KeepOldValues );
-   cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( float, ShrinkToFit, KeepOldValues );
-   cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( double, AlwaysReallocate, KeepOldValues );
-   cpPlugins_Instances_BaseObjects_extra_VariableLengthVector_SetSize( double, ShrinkToFit, KeepOldValues );
-*/
+#endif // cpPlugins_SYS_MACOS
 
 // eof - $RCSfile$