Merge pull request #1422 from jwillemsen/jwi-betamicro

Use micro version instead of beta version

7 files changed, 12 insertions, 12 deletions

diff --git a/ACE/ace/ACE.cpp b/ACE/ace/ACE.cpp
index 7a1b38b2bf0..c684ce76153 100644
--- a/ACE/ace/ACE.cpp
+++ b/ACE/ace/ACE.cpp
@@ -105,7 +105,7 @@ ACE::minor_version ()
 u_int
 ACE::beta_version ()
 {
-  return ACE_BETA_VERSION;
+  return ACE_MICRO_VERSION;
 }
 
 u_int
diff --git a/ACE/ace/ace.rc b/ACE/ace/ace.rc
index 54792491900..00a332dbe37 100644
--- a/ACE/ace/ace.rc
+++ b/ACE/ace/ace.rc
@@ -1,8 +1,8 @@
 #include "Version.h"
 
 1 VERSIONINFO
- FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
- PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_BETA_VERSION,0
+ FILEVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
+ PRODUCTVERSION ACE_MAJOR_VERSION,ACE_MINOR_VERSION,ACE_MICRO_VERSION,0
  FILEFLAGSMASK 0x3fL
  FILEFLAGS 0x0L
  FILEOS 0x4L
diff --git a/ACE/bin/generate_doxygen.pl b/ACE/bin/generate_doxygen.pl
index 679c6fcf85c..3827290f7d2 100755
--- a/ACE/bin/generate_doxygen.pl
+++ b/ACE/bin/generate_doxygen.pl
@@ -300,7 +300,7 @@ sub run_doxy {
 sub get_versions () {
   my $KIT = shift;
   my $VERSION_FILE = shift;
-  my ($major_version, $minor_version, $beta_version);
+  my ($major_version, $minor_version, $micro_version);
 
   open (VERSION, '<'.$VERSION_FILE)  ||
     die "$0: unable to open $VERSION_FILE\n";
@@ -309,23 +309,23 @@ sub get_versions () {
     if (/$KIT version (\d+)\.(\d+)\.(\d+)/) {
       $major_version = $1;
       $minor_version = $2;
-      $beta_version = $3;
+      $micro_version = $3;
       last;
     } elsif (/$KIT version (\d+)\.(\d+)[^\.]/) {
       #### Previous release was a minor.
       $major_version = $1;
       $minor_version = $2;
-      $beta_version  = '0';
+      $micro_version  = '0';
       last;
     } elsif (/$KIT version (\d+)[^\.]/) {
       #### Previous release was a major.
       $major_version = $1;
       $minor_version = '0';
-      $beta_version  = '0';
+      $micro_version  = '0';
       last;
     }
   }
   close VERSION;
 
-  return ($major_version, $minor_version, $beta_version);
+  return ($major_version, $minor_version, $micro_version);
 }
diff --git a/ACE/tests/CDR_Array_Test.cpp b/ACE/tests/CDR_Array_Test.cpp
index ed088cf2c29..d20d9b9123d 100644
--- a/ACE/tests/CDR_Array_Test.cpp
+++ b/ACE/tests/CDR_Array_Test.cpp
@@ -893,7 +893,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version(),
-              ACE::beta_version()));
+              ACE::micro_version()));
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("d:f:q:w:h:c:t:n:"));
   int dtotal = 0;
diff --git a/ACE/tests/CDR_File_Test.cpp b/ACE/tests/CDR_File_Test.cpp
index c10f0c2323a..edc6c8d8fd8 100644
--- a/ACE/tests/CDR_File_Test.cpp
+++ b/ACE/tests/CDR_File_Test.cpp
@@ -338,7 +338,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version (),
-              ACE::beta_version ()));
+              ACE::micro_version ()));
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("f:rw"));
   int opt;
diff --git a/ACE/tests/CDR_Test.cpp b/ACE/tests/CDR_Test.cpp
index 283f5a9e1ae..fa140dc5c65 100644
--- a/ACE/tests/CDR_Test.cpp
+++ b/ACE/tests/CDR_Test.cpp
@@ -852,7 +852,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version(),
-              ACE::beta_version()));
+              ACE::micro_version()));
 
   ACE_Get_Opt get_opt (argc, argv, ACE_TEXT ("dn:l:"));
   int opt;
diff --git a/ACE/tests/Codecs_Test.cpp b/ACE/tests/Codecs_Test.cpp
index 0bbcb4ce81c..c851b26c08e 100644
--- a/ACE/tests/Codecs_Test.cpp
+++ b/ACE/tests/Codecs_Test.cpp
@@ -88,7 +88,7 @@ run_main (int argc, ACE_TCHAR *argv[])
               ACE_TEXT ("This is ACE Version %u.%u.%u\n\n"),
               ACE::major_version (),
               ACE::minor_version(),
-              ACE::beta_version()));
+              ACE::micro_version()));
 
   ACE_DEBUG ((LM_DEBUG,
               ACE_TEXT ("Testing ACE Base64 - normal stream\n\n")));