diff options
-rw-r--r-- | TAO/ChangeLog | 14 | ||||
-rw-r--r-- | TAO/tao/PortableServer/BD_String_SArgument_T.cpp | 3 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Basic_SArgument_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Object_SArgument_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/PortableServer/UB_String_SArgument_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Var_Array_SArgument_T.cpp | 2 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Var_Size_SArgument_T.cpp | 4 | ||||
-rw-r--r-- | TAO/tao/PortableServer/Vector_SArgument_T.cpp | 3 |
11 files changed, 36 insertions, 2 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index d9b70478ca9..09910ebf38d 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,17 @@ +Thu Sep 1 06:31:53 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/PortableServer/BD_String_SArgument_T.cpp: + * tao/PortableServer/Basic_SArgument_T.cpp: + * tao/PortableServer/Fixed_Array_SArgument_T.cpp: + * tao/PortableServer/Fixed_Size_SArgument_T.cpp: + * tao/PortableServer/Object_SArgument_T.cpp: + * tao/PortableServer/Special_Basic_SArgument_T.cpp: + * tao/PortableServer/UB_String_SArgument_T.cpp: + * tao/PortableServer/Var_Array_SArgument_T.cpp: + * tao/PortableServer/Var_Size_SArgument_T.cpp: + * tao/PortableServer/Vector_SArgument_T.cpp: + Fixed coverity issues + Mon Aug 29 07:20:29 UTC 2011 Marcel Smit <msmit@remedy.nl> * orbsvcs/orbsvcs/ESF/ESF_Copy_On_Write.cpp: diff --git a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp index c10caac89fc..a69b65eb075 100644 --- a/TAO/tao/PortableServer/BD_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/BD_String_SArgument_T.cpp @@ -3,7 +3,10 @@ #ifndef TAO_BD_STRING_SARGUMENT_T_CPP #define TAO_BD_STRING_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/BD_String_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) diff --git a/TAO/tao/PortableServer/Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Basic_SArgument_T.cpp index 8dfab051a81..7854e33eee0 100644 --- a/TAO/tao/PortableServer/Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Basic_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_BASIC_SARGUMENT_T_CPP #define TAO_BASIC_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Basic_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Basic_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp index 5fa5e197343..3767425538c 100644 --- a/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Array_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_FIXED_ARRAY_SARGUMENT_T_CPP #define TAO_FIXED_ARRAY_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Fixed_Array_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Array_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp index 66e53e98988..285d90da9c5 100644 --- a/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Fixed_Size_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_FIXED_SIZE_SARGUMENT_T_CPP #define TAO_FIXED_SIZE_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Fixed_Size_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Fixed_Size_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Object_SArgument_T.cpp b/TAO/tao/PortableServer/Object_SArgument_T.cpp index 00e5b8948e4..163a0813883 100644 --- a/TAO/tao/PortableServer/Object_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Object_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_OBJECT_SARGUMENT_T_CPP #define TAO_OBJECT_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Object_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Object_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp index 2cdb15d8b5b..6fc56c84267 100644 --- a/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Special_Basic_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_SPECIAL_BASIC_SARGUMENT_T_CPP #define TAO_SPECIAL_BASIC_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Special_Basic_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Special_Basic_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp index 7f8db0408f5..d66915ae066 100644 --- a/TAO/tao/PortableServer/UB_String_SArgument_T.cpp +++ b/TAO/tao/PortableServer/UB_String_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_UB_STRING_SARGUMENT_T_CPP #define TAO_UB_STRING_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/UB_String_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/UB_String_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp index 0ba7f075cac..70600dbfbbd 100644 --- a/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Array_SArgument_T.cpp @@ -3,7 +3,9 @@ #ifndef TAO_VAR_ARRAY_SARGUMENT_T_CPP #define TAO_VAR_ARRAY_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Var_Array_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Array_SArgument_T.inl" diff --git a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp index a0aed6f8d57..eb1e13e4cb3 100644 --- a/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Var_Size_SArgument_T.cpp @@ -3,14 +3,16 @@ #ifndef TAO_VAR_SIZE_SARGUMENT_T_CPP #define TAO_VAR_SIZE_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Var_Size_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ + #include "tao/SystemException.h" #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Var_Size_SArgument_T.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, diff --git a/TAO/tao/PortableServer/Vector_SArgument_T.cpp b/TAO/tao/PortableServer/Vector_SArgument_T.cpp index de157b9975b..a55fed0717e 100644 --- a/TAO/tao/PortableServer/Vector_SArgument_T.cpp +++ b/TAO/tao/PortableServer/Vector_SArgument_T.cpp @@ -3,13 +3,14 @@ #ifndef TAO_VECTOR_SARGUMENT_T_CPP #define TAO_VECTOR_SARGUMENT_T_CPP +#if defined (ACE_TEMPLATES_REQUIRE_PRAGMA) #include "tao/PortableServer/Vector_SArgument_T.h" +#endif /* ACE_TEMPLATES_REQUIRE_PRAGMA */ #if !defined (__ACE_INLINE__) #include "tao/PortableServer/Vector_SArgument_T.inl" #endif /* __ACE_INLINE__ */ - TAO_BEGIN_VERSIONED_NAMESPACE_DECL template<typename S, |