summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2007-05-20 16:32:37 +0000
committerMatthias Melcher <fltk@matthiasm.com>2007-05-20 16:32:37 +0000
commitabde88e22021a1ab7f2abc119c3eed398f8ae524 (patch)
tree839a82edb19ab02a46f71a16e705cefd6ddc3050 /test
parentd8c288df3e51f156e9900313ec33b3d4c8ae3f84 (diff)
On OS X: disable all 'deprecated' warnings to be able to see the really important warnings. Nevertheless, we will have to replace all Carbon calls as soon as possible. Also re-fixed (i hope) the 'return' from an endless loop in 'threads.cxx'
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@5849 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test')
-rw-r--r--test/blocks.cxx2
-rw-r--r--test/threads.cxx15
2 files changed, 10 insertions, 7 deletions
diff --git a/test/blocks.cxx b/test/blocks.cxx
index 90707cc34..02999d6f2 100644
--- a/test/blocks.cxx
+++ b/test/blocks.cxx
@@ -735,7 +735,7 @@ BlockWindow::handle(int event) {
switch (event) {
case FL_PUSH :
- mx = w() - Fl::event_x() + BLOCK_SIZE;
+ mx = w() - Fl::event_x() + BLOCK_SIZE;
my = h() - Fl::event_y();
count = 0;
b = 0;
diff --git a/test/threads.cxx b/test/threads.cxx
index eece135f7..38444410b 100644
--- a/test/threads.cxx
+++ b/test/threads.cxx
@@ -70,7 +70,14 @@ void* prime_func(void* p)
}
// very simple prime number calculator !
- for (;;) {
+ //
+ // The return at the end of this function can never be reached and thus
+ // will generate a warning with some compilers, however we need to have
+ // a return statement or other compilers will complain there is no return
+ // statement. To avoid warnings on all compilers, we fool the smart ones
+ // into beleiving that there is a chance that we reach the end by testing
+ // n>=0, knowing that logically, n will never be negative in this context.
+ if (n>=0) for (;;) {
int pp;
int hn = (int)sqrt((double)n);
@@ -108,11 +115,7 @@ void* prime_func(void* p)
Fl::unlock();
}
}
- // This return can never be reached and thus will generate a warning with
- // some compilers, however we need to have a return statement or other
- // compilers will complain there is no return statement... You can't
- // win sometimes... :(
- return 0;
+ return 0L;
}
int main(int argc, char **argv)