diff options
| author | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-16 01:46:21 +0000 |
|---|---|---|
| committer | nanbor <nanbor@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-12-16 01:46:21 +0000 |
| commit | 2c4f3215dae6181e9efb98c6692ef023f4031f00 (patch) | |
| tree | 619c9ba41c439a4d34ac6b9d7df6d93755389c7f | |
| parent | 1176df7a9d741c7c327fe3589c2c19adafa8b5cb (diff) | |
| download | ATCD-2c4f3215dae6181e9efb98c6692ef023f4031f00.tar.gz | |
Commented out the "#pragma pack" directives.
| -rw-r--r-- | TAO/tao/ORB.h | 6 | ||||
| -rw-r--r-- | TAO/tao/corba.h | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/TAO/tao/ORB.h b/TAO/tao/ORB.h index ac8692bc2ff..659bb826faa 100644 --- a/TAO/tao/ORB.h +++ b/TAO/tao/ORB.h @@ -38,13 +38,14 @@ typedef enum TAO_SERVICEID_TRADINGSERVICE } TAO_Service_ID; +// @@ NW: Disable messing with the alignment for now. // For some reason, PC compilers don't implement "natural" alignment, // but only use fixed alignment policies. The following #pragmas // configure fixed one-byte alignment policy, since some fixed policy // needs to apply throughout an ORB. #if defined (_MSC_VER) -# pragma pack (push, 1) // VC++, stack 1-byte alignment policy +//# pragma pack (push, 1) // VC++, stack 1-byte alignment policy # ifdef _DEBUG // convert from VC++ convention ... # define DEBUG // ... to normal convention # endif @@ -1142,8 +1143,9 @@ private: #endif /* __ACE_INLINE__ */ #if defined (_MSC_VER) +// @@ NW: Disable messing with alignment for now. // VC++, goes back to other padding rules -# pragma pack (pop) +//# pragma pack (pop) #endif /* _MSV_VER */ #endif /* TAO_ORB_H */ diff --git a/TAO/tao/corba.h b/TAO/tao/corba.h index 6dda89b54f4..ee7e1d9a58e 100644 --- a/TAO/tao/corba.h +++ b/TAO/tao/corba.h @@ -81,7 +81,7 @@ // needs to apply throughout an ORB. #if defined (_MSC_VER) -# pragma pack (push, 1) // VC++, stack 1-byte alignment policy +//# pragma pack (push, 1) // VC++, stack 1-byte alignment policy # ifdef _DEBUG // convert from VC++ convention ... # define DEBUG // ... to normal convention @@ -173,7 +173,7 @@ typedef void (*TAO_Skeleton)( // by code emitted from an IDL compiler. #if defined (_MSC_VER) -#pragma pack (pop) // VC++, goes back to other padding rules +//#pragma pack (pop) // VC++, goes back to other padding rules #endif /* _MSC_VER */ // Alignment macros @@ -258,6 +258,3 @@ extern TAO_Export int operator== (const TAO_ObjectKey &l, #endif /* ACE_NESTED_CLASS */ #endif /* TAO_MASTER_CORBA_H */ - - - |