Merge pull request #1087 from jwillemsen/jwi-windows-arm

 Don't define _AMD64_ when we are cross compiling for ARM

5 files changed, 3 insertions, 8 deletions

diff --git a/ACE/ace/Malloc_Base.h b/ACE/ace/Malloc_Base.h
index 69bcf14268a..267021ce799 100644
--- a/ACE/ace/Malloc_Base.h
+++ b/ACE/ace/Malloc_Base.h
@@ -39,7 +39,6 @@ ACE_BEGIN_VERSIONED_NAMESPACE_DECL
 class ACE_Export ACE_Allocator
 {
 public:
-
   /// Unsigned integer type used for specifying memory block lengths.
   typedef size_t size_type;
 
diff --git a/ACE/ace/SString.h b/ACE/ace/SString.h
index a9cb4f0ef37..1f4f6749e83 100644
--- a/ACE/ace/SString.h
+++ b/ACE/ace/SString.h
@@ -56,7 +56,6 @@ template class ACE_Export ACE_String_Base_Const_Iterator<ACE_WSTRING_TYPE>;
 class ACE_Export ACE_NS_WString : public ACE_WString
 {
 public:
-
   using ACE_WString::size_type;
 
   /// Default constructor.
@@ -131,7 +130,6 @@ ACE_NS_WString operator + (const ACE_NS_WString &,
 class ACE_Export ACE_SString
 {
 public:
-
   typedef ACE_Allocator::size_type size_type;
 
   /// No position constant
diff --git a/ACE/ace/config-win32-common.h b/ACE/ace/config-win32-common.h
index 30f06adb140..624cce15114 100644
--- a/ACE/ace/config-win32-common.h
+++ b/ACE/ace/config-win32-common.h
@@ -40,8 +40,8 @@
 #  define ACE_WIN64
 
 // MPC template adds _AMD64_ but user projects not generated using MPC
-// may want to use _AMD64_ as well. Ensure it's there in all cases.
-#  ifndef _AMD64_
+// may want to use _AMD64_ as well. Ensure it's there in all non ARM cases
+#  if !defined (_AMD64_) && !defined(_ARM_) && !defined(_ARM64_)
 #    define _AMD64_
 #  endif
 
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp
index d55cdd28519..f879747db6b 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.cpp
@@ -259,7 +259,7 @@ TAO::PG_Group_List_Store::create_stream (const char * mode)
 bool
 TAO::PG_Group_List_Store::list_obsolete ()
 {
-  // TODO: Upate if obsolete flag is set based on CORBA call.
+  // TODO: Update if obsolete flag is set based on CORBA call.
   ACE_Auto_Ptr<TAO::Storable_Base> stream (this->create_stream ("r"));
   if (!stream->exists ())
     throw CORBA::INTERNAL ();
diff --git a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h
index 0f2c2cbc9f5..6a0d967e248 100644
--- a/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h
+++ b/TAO/orbsvcs/orbsvcs/PortableGroup/PG_Group_List_Store.h
@@ -87,7 +87,6 @@ namespace TAO
     bool list_obsolete ();
 
   private:
-
     Group_Ids group_ids_;
 
     /// Ensure ID is monotonically increasing even when groups gets
@@ -110,7 +109,6 @@ namespace TAO
     TAO_SYNCH_MUTEX lock_;
 
     friend class PG_Group_List_Store_File_Guard;
-
   };
 }