From 479cfac71ae6cf47ac46d02f2b4135ecbfd386a1 Mon Sep 17 00:00:00 2001
From: johnc <johnc@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>
Date: Tue, 5 Jun 2007 21:16:12 +0000
Subject: ChangeLogTag: Tue Jun  5 21:10:24 UTC 2007  Ciju John  <johnc at
 ociweb dot com>

---
 TAO/ChangeLog                                                    | 8 ++++++++
 TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp | 5 +++--
 TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp                      | 2 +-
 TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp                | 3 ++-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 847c5ed9bcd..7be9bb290ad 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -1,3 +1,11 @@
+Tue Jun  5 21:10:24 UTC 2007  Ciju John  <johnc at ociweb dot com>
+
+        * orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp:
+        * orbsvcs/orbsvcs/Trader/Constraint_y.cpp:
+        * tests/Bug_2560_Regression/Stock_Factory_i.cpp:
+          Corrected header includes order. This fixes log2 API not being
+          found errors on VxWorks6.4 RTI builds.
+
 Tue Jun  5 18:56:16 UTC 2007  Phil Mesnier  <mesnier_p@ociweb.com>
 
         * orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp:
diff --git a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
index 214179c6803..a5bf06974c2 100644
--- a/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
+++ b/TAO/orbsvcs/examples/Notify/Federation/SpaceCraft/SpaceCraft.cpp
@@ -2,8 +2,6 @@
 // author    : Boris Kolpackov <boris@dre.vanderbilt.edu>
 // cvs-id    : $Id$
 
-#include <iostream>
-#include <sstream>
 
 #include "ace/OS.h"
 
@@ -23,6 +21,9 @@
 
 #include "Gate/Gate.h"
 
+#include <iostream>
+#include <sstream>
+
 using std::cerr;
 using std::endl;
 
diff --git a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
index a47090bb330..b7bcda4de52 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_y.cpp
@@ -2,7 +2,7 @@
 static char const
 yyrcsid[] = "$FreeBSD: src/usr.bin/yacc/skeleton.c,v 1.28 2000/01/17 02:04:06 bde Exp $";
 #endif
-#include <stdlib.h>
+#include "ace/os_include/os_stdlib.h"
 #define YYBYACC 1
 #define YYMAJOR 1
 #define YYMINOR 9
diff --git a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
index a2f50986f5b..d07909c06d1 100644
--- a/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
+++ b/TAO/tests/Bug_2560_Regression/Stock_Factory_i.cpp
@@ -2,9 +2,10 @@
 // $Id$
 //
 
-#include <iostream>
 #include "Stock_Factory_i.h"
 
+#include <iostream>
+
 Quoter_Stock_Factory_i::Quoter_Stock_Factory_i ()
 {
   servant1_ = new Quoter_Stock_i("RHAT", "RedHat, Inc.", 210);
-- 
cgit v1.2.1