Alberto Meza wrote:
Hi,
How can I check in the change for both branches?
You need to 'merge' it to the other branch. It looks like
you have just checked it into HEAD right? If so, this is
what you would do to merge it to 150Cay.
First, you need to check out the audio project from 150Cay:
mkdir audio
cd audio
cvs -d :ext:[EMAIL PROTECTED]:/cvsroot/audio co -r hxclient_1_5_0_cayenne .
Now, since your change was only with one file, fixptutil/pub/math64.h,
we do this:
cd fixptutil/pub
cvs up -j HEAD math64.h
the command 'cvs up -j HEAD' tells cvs to bring any changes from the
HEAD version of math64.h and apply them to the version in the current
directory, 150Cay. Now, just make sure that only those changes
you want are present and that the file is still tagged as 150Cay:
cvs stat math64.h
===================================================================
File: math64.h Status: Locally Modified
Working revision: 1.26
Repository revision: 1.26 /cvsroot/audio/fixptutil/pub/math64.h,v
Sticky Tag: hxclient_1_5_0_cayenne (branch: 1.26.2)
Sticky Date: (none)
Sticky Options: (none)
You see that the file is still marked at 150Cay. Now check the diff to
make sure it looks good:
cvs diff -uw
You should see only those changes you made. If there are other changes,
or if there are conflicts during the merge (cvs got confused) then
you may just have to edit the file by hand. If it looks good, check it
in.
--greg.
Thanks and Regards
Alberto
-----Original Message-----
From: Greg Wright [mailto:[EMAIL PROTECTED]
Sent: Monday, May 02, 2005 12:40 PM
To: Alberto Meza
Cc: audio-dev
Subject: Re: [Audio-dev] CR: Change SymInt64 to INT64 for all symbian
versions
This looks OK for HEAD and 150Cay.
--greg.
Alberto Meza wrote:
Modified by:[EMAIL PROTECTED]
Reviewed by:
Date:05/02/2005
Project:Helix Symbian Player
Synopsis:
Change SymInt64 to INT64 for all symbian versions
Overview:
Since, it's not needed to use SymInt64 directly for Symbian version < 8.
It's possible change SymInt64 to INT64 to standardize for all symbian
versions.
Modified Files:
fixptutil/pub/math64.h
Image Size and Heap Use impact: None
Platforms and Profiles Affected: symbian-80-thumb, symbian-81-thumb,
helix-client-s60-advanced
Platforms and Profiles Build Verified: symbian-80-thumb, symbian-81-thumb,
helix-client-s60-advanced
Branches: HEad and 150Cay
Index: fixptutil/pub/math64.h
===================================================================
RCS file: /cvsroot/audio/fixptutil/pub/math64.h,v
retrieving revision 1.26
diff -u -w -r1.26 math64.h
--- fixptutil/pub/math64.h 21 Jan 2005 16:12:52 -0000 1.26
+++ fixptutil/pub/math64.h 29 Apr 2005 23:46:38 -0000
@@ -568,41 +568,41 @@
/* Compute (a * b) >> 32, using 64-bit intermediate result */
static __inline__ int MulShift32(int x, int y)
{
- SymInt64 a = x;
- SymInt64 b = y;
+ INT64 a = x;
+ INT64 b = y;
a *= b;
a >>= 32;
- return a.Low();
+ return INT64_TO_INT32(a);
}
/* Compute (a * b) >> 31, using 64-bit intermediate result */
static __inline__ int MulShift31(int x, int y)
{
- SymInt64 a = x;
- SymInt64 b = y;
+ INT64 a = x;
+ INT64 b = y;
a *= b;
a >>= 31;
- return a.Low();
+ return INT64_TO_INT32(a);
}
/* Compute (a * b) >> 30, using 64-bit intermediate result */
static __inline__ int MulShift30(int x, int y)
{
- SymInt64 a = x;
- SymInt64 b = y;
+ INT64 a = x;
+ INT64 b = y;
a *= b;
a >>= 30;
- return a.Low();
+ return INT64_TO_INT32(a);
}
/* Compute (a * b) >> n, using 64-bit intermediate result */
static __inline__ int MulShiftN(int x, int y, int n)
{
- SymInt64 a = x;
- SymInt64 b = y;
+ INT64 a = x;
+ INT64 b = y;
a *= b;
a >>= n;
- return a.Low();
+ return INT64_TO_INT32(a);
}
#define HAVE_FASTABS
_______________________________________________
Audio-dev mailing list
[email protected]
http://lists.helixcommunity.org/mailman/listinfo/audio-dev
_______________________________________________
Audio-dev mailing list
[email protected]
http://lists.helixcommunity.org/mailman/listinfo/audio-dev
