summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorDaniel Boelzle <dbo@openoffice.org>2001-10-19 12:25:15 +0000
committerDaniel Boelzle <dbo@openoffice.org>2001-10-19 12:25:15 +0000
commit9fd8a6b25497460d6a7424e1c9764ddb8f32c619 (patch)
treee091426b0394c3e1b36886de747cf58d06af771d /cppu
parentf8d74955b99b7878a92239057e86cab0a8c42780 (diff)
#92951# alignment tests
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/uno/data.cxx10
-rw-r--r--cppu/test/alignment.idl12
2 files changed, 11 insertions, 11 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 384d71c3c56b..e8e3ed198afe 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: data.cxx,v $
*
- * $Revision: 1.15 $
+ * $Revision: 1.16 $
*
- * last change: $Author: dbo $ $Date: 2001-10-19 13:04:06 $
+ * last change: $Author: dbo $ $Date: 2001-10-19 13:25:14 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -386,12 +386,12 @@ struct O : public M
};
struct O2 : public O
{
- double p;
+ double p2;
};
struct P : public N
{
- double p;
+ double p2;
};
struct empty
@@ -504,7 +504,7 @@ BinaryCompatible_Impl::BinaryCompatible_Impl()
#endif
BINTEST_VERIFYSIZE( O2, 24 );
- BINTEST_VERIFYOFFSET( O2, p, 16 );
+ BINTEST_VERIFYOFFSET( O2, p2, 16 );
BINTEST_VERIFYSIZE( Char3, 3 );
BINTEST_VERIFYOFFSET( Char4, c, 3 );
diff --git a/cppu/test/alignment.idl b/cppu/test/alignment.idl
index df89d21e08e7..21464bbae7f0 100644
--- a/cppu/test/alignment.idl
+++ b/cppu/test/alignment.idl
@@ -2,9 +2,9 @@
*
* $RCSfile: alignment.idl,v $
*
- * $Revision: 1.1 $
+ * $Revision: 1.2 $
*
- * last change: $Author: dbo $ $Date: 2001-10-17 14:04:26 $
+ * last change: $Author: dbo $ $Date: 2001-10-19 13:25:15 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -140,8 +140,8 @@ struct C14 : C1
struct C1x
{
- short s;
- double d;
+ short sx;
+ double dx;
};
struct C6x : C1x
@@ -226,11 +226,11 @@ struct O : M
};
struct O2 : O
{
- double p;
+ double p2;
};
struct P : N
{
- double p;
+ double p2;
};
}; // alignment