Menu
▾
▴
[Opende-svn] SF.net SVN: opende:[1926] trunk
|
From: <ole...@us...> - 2013-02-03 17:07:34
|
Revision: 1926
http://opende.svn.sourceforge.net/opende/?rev=1926&view=rev
Author: oleh_derevenko
Date: 2013-02-03 17:07:25 +0000 (Sun, 03 Feb 2013)
Log Message:
-----------
Changed: [u]int[8/16/32] renamed to contain "d" prefix so that global namespace was not polluted with these names unconditionally.
Fixed: Compilation errors fixed in 'tests'
Modified Paths:
--------------
trunk/CHANGELOG.txt
trunk/build/config-default.h
trunk/configure.ac
trunk/include/ode/common.h
trunk/include/ode/odeconfig.h
trunk/ode/src/Makefile.am
trunk/ode/src/obstack.cpp
trunk/tests/friction.cpp
trunk/tests/joint.cpp
trunk/tests/joints/ball.cpp
trunk/tests/joints/fixed.cpp
trunk/tests/joints/hinge.cpp
trunk/tests/joints/hinge2.cpp
trunk/tests/joints/piston.cpp
trunk/tests/joints/pr.cpp
trunk/tests/joints/pu.cpp
trunk/tests/joints/slider.cpp
trunk/tests/joints/universal.cpp
trunk/tests/odemath.cpp
Added Paths:
-----------
trunk/ode/src/typedefs.h
Modified: trunk/CHANGELOG.txt
===================================================================
--- trunk/CHANGELOG.txt 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/CHANGELOG.txt 2013-02-03 17:07:25 UTC (rev 1926)
@@ -8,6 +8,13 @@
* keep the format consistent (79 char width, M/D/Y date format).
------------------------------------------------------------------------------
+02/03/13 Oleh_derevenko
+ * [u]int[8/16/32] renamed to contain "d" prefix so that global namespace
+ was not polluted with these names unconditionally.
+ If your project depended on these types other than just for passing
+ parameters to ODE calls, add similar typedefs for yourself in some
+ of your project's global headers.
+
01/02/13 Oleh_derevenko
* Applied patch #183 by Joseph Cooper (complementary matrix
calculation fix).
Modified: trunk/build/config-default.h
===================================================================
--- trunk/build/config-default.h 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/build/config-default.h 2013-02-03 17:07:25 UTC (rev 1926)
@@ -126,4 +126,7 @@
#endif
+#include "typedefs.h"
+
+
#endif
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/configure.ac 2013-02-03 17:07:25 UTC (rev 1926)
@@ -493,6 +493,9 @@
#endif
+#include "typedefs.h"
+
+
#endif /* #define ODE_CONFIG_H */
])
Modified: trunk/include/ode/common.h
===================================================================
--- trunk/include/ode/common.h 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/include/ode/common.h 2013-02-03 17:07:25 UTC (rev 1926)
@@ -74,12 +74,12 @@
*/
#if dTRIMESH_16BIT_INDICES
#if dTRIMESH_GIMPACT
-typedef uint32 dTriIndex;
+typedef duint32 dTriIndex;
#else /* dTRIMESH_GIMPACT */
-typedef uint16 dTriIndex;
+typedef duint16 dTriIndex;
#endif /* dTRIMESH_GIMPACT */
#else /* dTRIMESH_16BIT_INDICES */
-typedef uint32 dTriIndex;
+typedef duint32 dTriIndex;
#endif /* dTRIMESH_16BIT_INDICES */
/* round an integer up to a multiple of 4, except that 0 and 1 are unmodified
Modified: trunk/include/ode/odeconfig.h
===================================================================
--- trunk/include/ode/odeconfig.h 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/include/ode/odeconfig.h 2013-02-03 17:07:25 UTC (rev 1926)
@@ -74,19 +74,19 @@
/* Well-defined common data types...need to define for 64 bit systems */
#if defined(_M_IA64) || defined(__ia64__) || defined(_M_AMD64) || defined(__x86_64__)
#define X86_64_SYSTEM 1
- typedef int int32;
- typedef unsigned int uint32;
- typedef short int16;
- typedef unsigned short uint16;
- typedef signed char int8;
- typedef unsigned char uint8;
+ typedef int dint32;
+ typedef unsigned int duint32;
+ typedef short dint16;
+ typedef unsigned short duint16;
+ typedef signed char dint8;
+ typedef unsigned char duint8;
#else
- typedef int int32;
- typedef unsigned int uint32;
- typedef short int16;
- typedef unsigned short uint16;
- typedef signed char int8;
- typedef unsigned char uint8;
+ typedef int dint32;
+ typedef unsigned int duint32;
+ typedef short dint16;
+ typedef unsigned short duint16;
+ typedef signed char dint8;
+ typedef unsigned char duint8;
#endif
Modified: trunk/ode/src/Makefile.am
===================================================================
--- trunk/ode/src/Makefile.am 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/ode/src/Makefile.am 2013-02-03 17:07:25 UTC (rev 1926)
@@ -61,16 +61,17 @@
step.cpp step.h \
timer.cpp \
threading_atomics_provs.h \
+ threading_base.cpp threading_base.h \
threading_fake_sync.h \
+ threading_impl.cpp threading_impl.h \
+ threading_impl_posix.h \
threading_impl_templates.h \
- threading_impl_posix.h \
threading_impl_win.h \
- threading_impl.cpp threading_impl.h \
threading_pool_posix.cpp \
threading_pool_win.cpp \
- threading_base.cpp threading_base.h \
- util.cpp util.h \
- threadingutils.h
+ threadingutils.h \
+ typedefs.h \
+ util.cpp util.h
###################################
Modified: trunk/ode/src/obstack.cpp
===================================================================
--- trunk/ode/src/obstack.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/ode/src/obstack.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -31,7 +31,7 @@
// macros and constants
#define ROUND_UP_OFFSET_TO_EFFICIENT_SIZE(arena,ofs) \
- ofs = (size_t) (dEFFICIENT_SIZE( ((intP)(arena)) + ofs ) - ((intP)(arena)) )
+ ofs = (size_t) (dEFFICIENT_SIZE( ((size_t)(arena)) + ofs ) - ((size_t)(arena)) )
#define MAX_ALLOC_SIZE \
((size_t)(dOBSTACK_ARENA_SIZE - sizeof (Arena) - EFFICIENT_ALIGNMENT + 1))
Added: trunk/ode/src/typedefs.h
===================================================================
--- trunk/ode/src/typedefs.h (rev 0)
+++ trunk/ode/src/typedefs.h 2013-02-03 17:07:25 UTC (rev 1926)
@@ -0,0 +1,40 @@
+/*************************************************************************
+ * *
+ * Open Dynamics Engine, Copyright (C) 2001-2003 Russell L. Smith. *
+ * All rights reserved. Email: ru...@q1... Web: www.q12.org *
+ * *
+ * This library is free software; you can redistribute it and/or *
+ * modify it under the terms of EITHER: *
+ * (1) The GNU Lesser General Public License as published by the Free *
+ * Software Foundation; either version 2.1 of the License, or (at *
+ * your option) any later version. The text of the GNU Lesser *
+ * General Public License is included with this library in the *
+ * file LICENSE.TXT. *
+ * (2) The BSD-style license that is included with this library in *
+ * the file LICENSE-BSD.TXT. *
+ * *
+ * This library is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the files *
+ * LICENSE.TXT and LICENSE-BSD.TXT for more details. *
+ * *
+ *************************************************************************/
+
+#ifndef _ODE_TYPEDEFS_H_
+#define _ODE_TYPEDEFS_H_
+
+
+/*
+ * Internal typedefs to map public types into more convenient private types
+ */
+
+
+typedef dint32 int32;
+typedef duint32 uint32;
+typedef dint16 int16;
+typedef duint16 uint16;
+typedef dint8 int8;
+typedef duint8 uint8;
+
+
+#endif
Modified: trunk/tests/friction.cpp
===================================================================
--- trunk/tests/friction.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/friction.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -31,6 +31,7 @@
#include <algorithm>
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../ode/src/config.h"
#include "../ode/src/joints/joints.h"
@@ -69,7 +70,7 @@
test_ZeroMu)
{
dxJoint::Info1 info1;
- dxJoint::Info2 info2;
+ dxJoint::Info2Descr info2;
dReal dummy_J[3][12] = {{0}};
dReal dummy_c[3];
dReal dummy_cfm[3];
@@ -77,8 +78,8 @@
dReal dummy_hi[3];
int dummy_findex[3];
- info2.fps = 100;
- info2.erp = 0;
+ dReal info2_fps = 100;
+ dReal info2_erp = 0;
info2.J1l = dummy_J[0];
info2.J1a = dummy_J[0] + 3;
info2.J2l = dummy_J[0] + 6;
@@ -137,7 +138,7 @@
joint->getInfo1(&info1);
CHECK_EQUAL(2, (int)info1.m);
ZERO_ALL;
- joint->getInfo2(&info2);
+ joint->getInfo2(info2_fps, info2_erp, &info2);
CHECK_CLOSE(0, dummy_J[1][0], 1e-6);
CHECK_CLOSE(0, dummy_J[1][1], 1e-6);
CHECK_CLOSE(-1, dummy_J[1][2], 1e-6);
@@ -166,7 +167,7 @@
joint->getInfo1(&info1);
CHECK_EQUAL(2, (int)info1.m);
ZERO_ALL;
- joint->getInfo2(&info2);
+ joint->getInfo2(info2_fps, info2_erp, &info2);
CHECK_CLOSE(0, dummy_J[1][0], 1e-6);
CHECK_CLOSE(1, dummy_J[1][1], 1e-6);
CHECK_CLOSE(0, dummy_J[1][2], 1e-6);
Modified: trunk/tests/joint.cpp
===================================================================
--- trunk/tests/joint.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joint.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -30,6 +30,7 @@
////////////////////////////////////////////////////////////////////////////////
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../ode/src/config.h"
#include "../ode/src/joints/joints.h"
Modified: trunk/tests/joints/ball.cpp
===================================================================
--- trunk/tests/joints/ball.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/ball.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -32,6 +32,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/ball.h"
Modified: trunk/tests/joints/fixed.cpp
===================================================================
--- trunk/tests/joints/fixed.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/fixed.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -32,6 +32,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/fixed.h"
SUITE (TestdxJointFixed)
Modified: trunk/tests/joints/hinge.cpp
===================================================================
--- trunk/tests/joints/hinge.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/hinge.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -32,6 +32,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/hinge.h"
SUITE (TestdxJointHinge)
Modified: trunk/tests/joints/hinge2.cpp
===================================================================
--- trunk/tests/joints/hinge2.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/hinge2.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -32,6 +32,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/hinge2.h"
Modified: trunk/tests/joints/piston.cpp
===================================================================
--- trunk/tests/joints/piston.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/piston.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -32,6 +32,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/piston.h"
SUITE (TestdxJointPiston)
Modified: trunk/tests/joints/pr.cpp
===================================================================
--- trunk/tests/joints/pr.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/pr.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -32,6 +32,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/pr.h"
SUITE (TestdxJointPR)
Modified: trunk/tests/joints/pu.cpp
===================================================================
--- trunk/tests/joints/pu.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/pu.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -32,6 +32,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/pu.h"
SUITE (TestdxJointPU)
Modified: trunk/tests/joints/slider.cpp
===================================================================
--- trunk/tests/joints/slider.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/slider.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -33,6 +33,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/slider.h"
SUITE (TestdxJointSlider)
Modified: trunk/tests/joints/universal.cpp
===================================================================
--- trunk/tests/joints/universal.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/joints/universal.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -32,6 +32,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
+#include "../../ode/src/config.h"
#include "../../ode/src/joints/universal.h"
dReal d2r(dReal degree)
Modified: trunk/tests/odemath.cpp
===================================================================
--- trunk/tests/odemath.cpp 2013-01-21 20:19:04 UTC (rev 1925)
+++ trunk/tests/odemath.cpp 2013-02-03 17:07:25 UTC (rev 1926)
@@ -24,7 +24,7 @@
#include <UnitTest++.h>
#include <ode/ode.h>
-#include "ode/odemath.h"
+#include <ode/odemath.h>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|