Merge pull request #263 from mitza-oci/master

Removed support for vc71 and TAO 1.x.
OpenDDS · Dec 22, 2015 · 74ac421 · 74ac421
2 parents 0df232f + c088509
commit 74ac421
Show file tree

Hide file tree

Showing 23 changed files with 5 additions and 254 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,6 +13,7 @@ lib*.dylib
 *.sln
 *.suo
 .*.swp
+*.VC.opendb
 
 /setenv.sh
 /setenv.cmd
@@ -24,4 +25,3 @@ lib*.dylib
 /build
 /ipch
 /ACE_wrappers
-/*.VC.opendb
diff --git a/dds/DCPS/LocalObject.h b/dds/DCPS/LocalObject.h
@@ -26,11 +26,7 @@ typedef CORBA::LocalObject_var LocalObject_var;
 template <class Stub>
 class LocalObject
   : public virtual Stub
-#if TAO_MAJOR_VERSION > 1 || TAO_MINOR_VERSION > 6
   , public virtual CORBA::LocalObject
-#else
-  , public virtual TAO_Local_RefCounted_Object
-#endif
   , public virtual PoolAllocationBase
 {
 public:

diff --git a/dds/DCPS/RTPS/GuidGenerator.cpp b/dds/DCPS/RTPS/GuidGenerator.cpp
@@ -26,11 +26,7 @@ GuidGenerator::GuidGenerator()
 
   if (pid_ == -1) {
     unsigned seed = static_cast<unsigned>(ACE_OS::gettimeofday().usec());
-#if ACE_MAJOR_VERSION >= 6
     pid_ = static_cast<pid_t>(ACE_OS::rand_r(&seed));
-#else
-    pid_ = static_cast<pid_t>(ACE_OS::rand_r(seed));
-#endif
   }
 
   ACE_OS::macaddr_node_t macaddress;

diff --git a/dds/DCPS/ZeroCopySeq_T.cpp b/dds/DCPS/ZeroCopySeq_T.cpp
@@ -58,7 +58,7 @@ ZeroCopyDataSeq<Sample_T, DEF_MAX>::ZeroCopyDataSeq(
   }
 }
 
-#if defined (_MSC_VER) && (_MSC_VER >= 1400)
+#if defined (_MSC_VER)
 #pragma warning (disable:4996) //std::copy OK here
 #endif
 template <class Sample_T, size_t DEF_MAX>
@@ -117,7 +117,7 @@ ZeroCopyDataSeq<Sample_T, DEF_MAX>::length(CORBA::ULong length)
     }
   }
 }
-#if defined (_MSC_VER) && (_MSC_VER >= 1400)
+#if defined (_MSC_VER)
 #pragma warning (default:4996)
 #endif
 
@@ -150,7 +150,7 @@ ZeroCopyDataSeq<Sample_T, DEF_MAX>::get_buffer(
   return yours.sc_buffer_;
 }
 
-#if defined (_MSC_VER) && (_MSC_VER >= 1400)
+#if defined (_MSC_VER)
 #pragma warning (default:4996)
 #endif
 

diff --git a/dds/idl/be_global.cpp b/dds/idl/be_global.cpp
@@ -318,34 +318,6 @@ BE_GlobalData::parse_args(long& i, char** av)
 }
 
 
-#if ACE_MAJOR_VERSION < 6 && ACE_MINOR_VERSION < 8
-
-void
-BE_GlobalData::prep_be_arg(char* arg)
-{
-  be_util::prep_be_arg(arg);
-}
-
-// Does nothing in this backend.
-void
-BE_GlobalData::arg_post_proc()
-{
-}
-
-void
-BE_GlobalData::usage() const
-{
-  be_util::usage();
-}
-
-AST_Generator*
-BE_GlobalData::generator_init()
-{
-  return be_util::generator_init();
-}
-
-#endif
-
 bool
 BE_GlobalData::writeFile(const char* fileName, const string& content)
 {

diff --git a/dds/idl/be_global.h b/dds/idl/be_global.h
@@ -55,24 +55,6 @@ class BE_GlobalData {
   void parse_args(long& i, char** av);
   // Parse args that affect the backend.
 
-
-#if ACE_MAJOR_VERSION < 6 && ACE_MINOR_VERSION < 8
-
-  void prep_be_arg(char* s);
-  // Special BE arg call factored out of DRV_args.
-
-  void arg_post_proc();
-  // Checks made after parsing args.
-
-  void usage() const;
-  // Display usage of BE-specific options.
-
-  AST_Generator* generator_init();
-  // Create an AST node generator.
-
-#endif
-
-
   void open_streams(const char* filename);
 
   std::ostringstream header_, impl_, idl_, ws_config_, itl_, facets_header_, facets_impl_,

diff --git a/dds/idl/be_init.cpp b/dds/idl/be_init.cpp
@@ -54,11 +54,6 @@ BE_post_init(char*[], long)
     }
     be_global->add_inc_path(dds_root.c_str());
     ACE_CString included;
-    DRV_add_include_path(included, dds_root.c_str(), 0
-#if TAO_MAJOR_VERSION > 1 || (TAO_MAJOR_VERSION == 1 && TAO_MINOR_VERSION > 6)
-, true);
-#else
-);
-#endif
+    DRV_add_include_path(included, dds_root.c_str(), 0, true);
   }
 }
diff --git a/dds/idl/be_produce.cpp b/dds/idl/be_produce.cpp
@@ -144,13 +144,7 @@ string to_macro(const char* fn)
   for (unsigned int n = 0; n < NUM_CHARS; ++n) {
     char r;
     do {
-#if ACE_MAJOR_VERSION * 256 * 256 + ACE_MINOR_VERSION * 256 + ACE_BETA_VERSION > 0x060001
-      // ACE 6.0.2 and later
       r = static_cast<char>(coefficient * ACE_OS::rand_r(&seed));
-#else
-      // Prior to ACE 6.0.2
-      r = static_cast<char>(coefficient * ACE_OS::rand_r(seed));
-#endif
     } while (!isalnum(r));
 
     ret += static_cast<char>(toupper(r));

diff --git a/dds/idl/dds_visitor.cpp b/dds/idl/dds_visitor.cpp
@@ -564,9 +564,6 @@ int dds_visitor::visit_valuebox(AST_ValueBox*)
   return 0;
 }
 
-#if (TAO_MAJOR_VERSION > 1 || (TAO_MAJOR_VERSION == 1 && \
-    (TAO_MINOR_VERSION >= 7)))
-
 int
 dds_visitor::visit_template_module (AST_Template_Module*)
 {
@@ -640,5 +637,3 @@ int dds_visitor::visit_finder(AST_Finder*)
 {
   return 0;
 }
-
-#endif
diff --git a/dds/idl/dds_visitor.h b/dds/idl/dds_visitor.h
@@ -103,9 +103,6 @@ class dds_visitor : public ast_visitor {
 
   virtual int visit_valuebox(AST_ValueBox* node);
 
-#if (TAO_MAJOR_VERSION > 1 || (TAO_MAJOR_VERSION == 1 && \
-  (TAO_MINOR_VERSION >= 7)))
-
   virtual int visit_template_module (AST_Template_Module* node);
 
   virtual int visit_template_module_inst (AST_Template_Module_Inst* node);
@@ -134,8 +131,6 @@ class dds_visitor : public ast_visitor {
 
   virtual int visit_finder(AST_Finder* node);
 
-#endif
-
 protected:
   AST_Decl* scope_;
   bool error_;

diff --git a/dds/idl/langmap_generator.cpp b/dds/idl/langmap_generator.cpp
@@ -1330,7 +1330,6 @@ bool langmap_generator::gen_typedef(AST_Typedef*, UTL_ScopedName* name, AST_Type
     case AST_Decl::NT_array:
       gen_array(name, arr = AST_Array::narrow_from_decl(base));
       break;
-#if ACE_MAJOR_VERSION > 5
     case AST_Decl::NT_fixed:
 # ifdef ACE_HAS_CDR_FIXED
       gen_fixed(name, AST_Fixed::narrow_from_decl(base));
@@ -1340,7 +1339,6 @@ bool langmap_generator::gen_typedef(AST_Typedef*, UTL_ScopedName* name, AST_Type
         " with this version of ACE+TAO\n";
       return false;
 # endif
-#endif
     default:
       be_global->lang_header_ <<
         "typedef " << map_type(base) << ' ' << nm << ";\n";

diff --git a/java/idl2jni/codegen/be_global.cpp b/java/idl2jni/codegen/be_global.cpp
@@ -239,33 +239,6 @@ BE_GlobalData::parse_args(long &i, char **av)
   }
 }
 
-#if ACE_MAJOR_VERSION < 6 && ACE_MINOR_VERSION < 8
-
-void
-BE_GlobalData::prep_be_arg(char *arg)
-{
-  be_util::prep_be_arg(arg);
-}
-
-// Does nothing in this backend.
-void
-BE_GlobalData::arg_post_proc()
-{
-}
-
-void
-BE_GlobalData::usage() const
-{
-  be_util::usage();
-}
-
-AST_Generator *
-BE_GlobalData::generator_init()
-{
-  return be_util::generator_init();
-}
-
-#endif
 
 bool
 BE_GlobalData::writeFile(const char *fileName, const string &content)

diff --git a/java/idl2jni/codegen/be_global.h b/java/idl2jni/codegen/be_global.h
@@ -57,20 +57,6 @@ class BE_GlobalData {
   void parse_args(long &i, char **av);
   // Parse args that affect the backend.
 
-#if ACE_MAJOR_VERSION < 6 && ACE_MINOR_VERSION < 8
-  void prep_be_arg(char *s);
-  // Special BE arg call factored out of DRV_args.
-
-  void arg_post_proc();
-  // Checks made after parsing args.
-
-  void usage() const;
-  // Display usage of BE-specific options.
-
-  AST_Generator *generator_init();
-  // Create an AST node generator.
-#endif
-
   void open_streams(const char *filename);
   void close_streams();
 

diff --git a/java/idl2jni/codegen/idl2jni_visitor.cpp b/java/idl2jni/codegen/idl2jni_visitor.cpp
@@ -592,9 +592,6 @@ int idl2jni_visitor::visit_valuebox(AST_ValueBox *)
   return 0;
 }
 
-#if (TAO_MAJOR_VERSION > 1 || \
-     (TAO_MAJOR_VERSION == 1 && (TAO_MINOR_VERSION >= 7)))
-
 int
 idl2jni_visitor::visit_template_module (AST_Template_Module *)
 {
@@ -668,5 +665,3 @@ int idl2jni_visitor::visit_finder(AST_Finder *)
 {
   return 0;
 }
-
-#endif
diff --git a/java/idl2jni/codegen/idl2jni_visitor.h b/java/idl2jni/codegen/idl2jni_visitor.h
@@ -103,9 +103,6 @@ class idl2jni_visitor : public ast_visitor {
 
   virtual int visit_valuebox(AST_ValueBox *node);
 
-#if (TAO_MAJOR_VERSION > 1 || \
-     (TAO_MAJOR_VERSION == 1 && (TAO_MINOR_VERSION > 7)))
-
   virtual int visit_template_module (AST_Template_Module *node);
 
   virtual int visit_template_module_inst (AST_Template_Module_Inst *node);
@@ -134,8 +131,6 @@ class idl2jni_visitor : public ast_visitor {
 
   virtual int visit_finder(AST_Finder *node);
 
-#endif
-
 protected:
   AST_Decl *scope_;
   CORBA::Boolean in_reopened_;

diff --git a/java/idl2jni/codegen/im_java.cpp b/java/idl2jni/codegen/im_java.cpp
@@ -774,14 +774,12 @@ void writeUnionDefaultValue(ostream &os, AST_Expression::ExprType udisc_type,
   case AST_Expression::EV_enum:
     os << dv.u.enum_val;
     break;
-#if !(ACE_MAJOR_VERSION == 5 && ACE_MINOR_VERSION < 6)
   case AST_Expression::EV_longlong:
     os << dv.u.longlong_val;
     break;
   case AST_Expression::EV_ulonglong:
     os << dv.u.ulonglong_val;
     break;
-#endif
   default:
     cerr << "ERROR: Bad discriminant type (shouldn't happen here)\n";
   }

diff --git a/java/idl2jni/runtime/idl2jni_BaseJavaPeer.h b/java/idl2jni/runtime/idl2jni_BaseJavaPeer.h
@@ -15,11 +15,7 @@
 #include "tao/Version.h"
 
 class idl2jni_runtime_Export IDL2JNI_BaseJavaPeer
-#if TAO_MAJOR_VERSION > 1 || TAO_MINOR_VERSION > 6
   : public virtual CORBA::LocalObject
-#else
-  : public virtual TAO_Local_RefCounted_Object
-#endif
 {
 public:
   IDL2JNI_BaseJavaPeer(JNIEnv *jni, jobject local)

diff --git a/performance-tests/DCPS/SimpleE2ETest/Reader.cpp b/performance-tests/DCPS/SimpleE2ETest/Reader.cpp
@@ -10,28 +10,11 @@
 #include "../TypeNoKeyBounded/PTDefTypeSupportImpl.h"
 
 
-// Only for Microsoft VC6
-#if defined (_MSC_VER) && (_MSC_VER >= 1200) && (_MSC_VER < 1300)
-
-// Added unused arguments with default value to work around with vc6
-// bug on template function instantiation.
-template<class Tseq, class R, class R_var, class R_ptr, class Rimpl>
-::DDS::ReturnCode_t read (TestStats* stats,
-                          ::DDS::Subscriber_ptr subscriber,
-                          ::DDS::DataReader_ptr reader,
-                          R* rd = 0)
-{
-  ACE_UNUSED_ARG(rd);
-
-#else
-
 template<class Tseq, class R, class R_var, class R_ptr, class Rimpl>
 ::DDS::ReturnCode_t read (TestStats* stats,
                           ::DDS::Subscriber_ptr subscriber,
                           ::DDS::DataReader_ptr reader)
 {
-#endif
-
   R_var pt_dr
     = R::_narrow(reader);
   if (CORBA::is_nil (pt_dr.in ()))

diff --git a/performance-tests/DCPS/SimpleE2ETest/Writer.cpp b/performance-tests/DCPS/SimpleE2ETest/Writer.cpp
@@ -8,30 +8,12 @@
 #include "ace/OS_NS_unistd.h"
 
 
-// Only for Microsoft VC6
-#if defined (_MSC_VER) && (_MSC_VER >= 1200) && (_MSC_VER < 1300)
-
-// Added unused arguments with default value to work around with vc6
-// bug on template function instantiation.
-template<class T, class W, class W_var, class W_ptr, class Wimpl>
-void write (long id,
-            int size,
-            int num_messages,
-            ::DDS::DataWriter_ptr writer,
-            T* t = 0)
-{
-  ACE_UNUSED_ARG(t);
-
-#else
-
 template<class T, class W, class W_var, class W_ptr, class Wimpl>
 void write (long id,
             int size,
             int num_messages,
             ::DDS::DataWriter_ptr writer)
 {
-#endif
-
   T data;
   data.data_source = id;
   data.values.length(size);