[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog libbase/container.h libbase/cur...
|
From: |
Bastiaan Jacques |
|
Subject: |
[Gnash-commit] gnash ChangeLog libbase/container.h libbase/cur... |
|
Date: |
Thu, 27 Jul 2006 01:47:12 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Bastiaan Jacques <bjacques> 06/07/27 01:47:11
Modified files:
. : ChangeLog
libbase : container.h curl_adapter.cpp dlmalloc.h
image.cpp image.h image_filters.cpp jpeg.h
ogl.h triangulate_impl.h tu_swap.h tu_timer.h
libgeometry : cull.cpp cull.h geometry.cpp geometry.h
server : ActionExec.cpp action.cpp action_buffer.cpp
array.cpp array.h as_environment.cpp
as_value.cpp button.cpp button.h
character_def.h font.cpp fontlib.cpp render.h
shm.cpp stream.h tesselate.cpp tesselate.h
timers.cpp types.cpp types.h xmlnode.cpp
server/asobj : Math.cpp
server/swf : ASHandlers.cpp tag_loaders.cpp
Log message:
Facilitate the use of -pedantic in combination
with -ansi by avoiding non-ISO C++. Avoid extra semicolons. Use the
`l' instead of the `z' length modifier in printf-style sequences.
Don't use the C99 long long modifier in hex constants.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.533&r2=1.534
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/container.h?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/curl_adapter.cpp?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/dlmalloc.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image.h?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/image_filters.cpp?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/jpeg.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/ogl.h?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/triangulate_impl.h?cvsroot=gnash&r1=1.9&r2=1.10
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_swap.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/tu_timer.h?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/cull.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/cull.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/geometry.cpp?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/geometry.h?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/server/ActionExec.cpp?cvsroot=gnash&r1=1.17&r2=1.18
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action.cpp?cvsroot=gnash&r1=1.96&r2=1.97
http://cvs.savannah.gnu.org/viewcvs/gnash/server/action_buffer.cpp?cvsroot=gnash&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.cpp?cvsroot=gnash&r1=1.33&r2=1.34
http://cvs.savannah.gnu.org/viewcvs/gnash/server/array.h?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_environment.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/as_value.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button.cpp?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/server/button.h?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/server/character_def.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/font.cpp?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/fontlib.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/render.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/server/stream.h?cvsroot=gnash&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/gnash/server/tesselate.cpp?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/server/tesselate.h?cvsroot=gnash&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/gnash/server/timers.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.cpp?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/types.h?cvsroot=gnash&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/gnash/server/xmlnode.cpp?cvsroot=gnash&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Math.cpp?cvsroot=gnash&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/ASHandlers.cpp?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/server/swf/tag_loaders.cpp?cvsroot=gnash&r1=1.17&r2=1.18
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.533
retrieving revision 1.534
diff -u -b -r1.533 -r1.534
--- ChangeLog 27 Jul 2006 00:15:22 -0000 1.533
+++ ChangeLog 27 Jul 2006 01:47:10 -0000 1.534
@@ -1,3 +1,10 @@
+2006-07-27 Bastiaan Jacques <address@hidden>
+
+ * all over the place: Facilitate the use of -pedantic in combination
+ with -ansi by avoiding non-ISO C++. Avoid extra semicolons. Use the
+ `l' instead of the `z' length modifier in printf-style sequences.
+ Don't use the C99 long long modifier in hex constants.
+
2006-07-27 Ivor Blockley <address@hidden>
* gui/{gtk.cpp, gui.cpp, gui.h, sdl.cpp}, server/{movie.h,
Index: libbase/container.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/container.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- libbase/container.h 7 Jun 2006 04:28:46 -0000 1.15
+++ libbase/container.h 27 Jul 2006 01:47:10 -0000 1.16
@@ -63,10 +63,15 @@
#include <sys/types.h>
#include <pthread.h>
#include <time.h>
+
// This screws up MingW
+#if 0
+// And what's the point?
clock_t clock __P((void));
size_t strftime __P((char *, size_t, const char *, const struct tm *));
-#endif
+#endif // 0
+
+#endif // ! HAVE_WINSOCK_H
//#include "tu_config.h"
#include "utility.h"
Index: libbase/curl_adapter.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/curl_adapter.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- libbase/curl_adapter.cpp 17 Jul 2006 01:22:32 -0000 1.8
+++ libbase/curl_adapter.cpp 27 Jul 2006 01:47:11 -0000 1.9
@@ -205,7 +205,7 @@
char errmsg[256];
snprintf(errmsg, 255,
- "writing to cache file: requested %zd, wrote %zd (%s)",
+ "writing to cache file: requested %ld, wrote %ld (%s)",
sz, wrote, strerror(errno));
fprintf(stderr, "%s\n", errmsg);
throw gnash::GnashException(errmsg);
@@ -399,7 +399,7 @@
#ifdef GNASH_CURL_WARN_SEEKSBACK
if ( pos < tell() ) {
fprintf(stderr,
- "Warning: seek backward requested (%zd from %zd)\n",
+ "Warning: seek backward requested (%ld from %ld)\n",
pos, tell());
}
#endif
Index: libbase/dlmalloc.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/dlmalloc.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libbase/dlmalloc.h 6 Mar 2006 01:43:26 -0000 1.3
+++ libbase/dlmalloc.h 27 Jul 2006 01:47:11 -0000 1.4
@@ -689,7 +689,7 @@
#ifdef __cplusplus
-}; /* end of extern "C" */
+} /* end of extern "C" */
#endif
#endif /* MALLOC_270_H */
Index: libbase/image.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/image.cpp 8 May 2006 21:12:24 -0000 1.7
+++ libbase/image.cpp 27 Jul 2006 01:47:11 -0000 1.8
@@ -501,7 +501,7 @@
image->m_height = new_h;
image->m_pitch = new_pitch;
}
-};
+}
// Local Variables:
Index: libbase/image.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/image.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- libbase/image.h 8 May 2006 21:12:24 -0000 1.5
+++ libbase/image.h 27 Jul 2006 01:47:11 -0000 1.6
@@ -12,7 +12,7 @@
#include "tu_config.h"
#include "tu_types.h"
class tu_file;
-namespace jpeg { struct input; };
+namespace jpeg { struct input; }
/// Handy image utilities for RGB surfaces.
@@ -122,7 +122,7 @@
/// Fast, in-place resample. For making mip-maps. Munges the
/// input image to produce the output image.
void make_next_miplevel(rgba* image);
-};
+}
#endif // IMAGE_H
Index: libbase/image_filters.cpp
===================================================================
RCS file: /sources/gnash/gnash/libbase/image_filters.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- libbase/image_filters.cpp 8 May 2006 21:12:24 -0000 1.7
+++ libbase/image_filters.cpp 27 Jul 2006 01:47:11 -0000 1.8
@@ -328,7 +328,7 @@
};
-}; // end anonymous namespace
+} // end anonymous namespace
namespace image {
Index: libbase/jpeg.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/jpeg.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/jpeg.h 3 Feb 2006 21:31:32 -0000 1.2
+++ libbase/jpeg.h 27 Jul 2006 01:47:11 -0000 1.3
@@ -69,7 +69,7 @@
// ...
virtual void write_scanline(unsigned char* rgb_data) = 0;
};
-};
+}
#endif // JPEG_H
Index: libbase/ogl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/ogl.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libbase/ogl.h 7 Jun 2006 04:28:46 -0000 1.2
+++ libbase/ogl.h 27 Jul 2006 01:47:11 -0000 1.3
@@ -44,7 +44,7 @@
void client_active_texture(int stage);
void multi_tex_coord_2f(int stage, float s, float t);
void multi_tex_coord_2fv(int stage, float* st);
-};
+}
// Some old gl/gl.h files don't define these, e.g. default Windows includes.
Index: libbase/triangulate_impl.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/triangulate_impl.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- libbase/triangulate_impl.h 20 Apr 2006 18:09:51 -0000 1.9
+++ libbase/triangulate_impl.h 27 Jul 2006 01:47:11 -0000 1.10
@@ -1870,7 +1870,7 @@
{
// Bad input, odd number of coords.
assert(0);
- fprintf(stderr, "path[%d] has odd number of coords
(%zd), dropping last value\n", i, path.size());//xxxx
+ fprintf(stderr, "path[%d] has odd number of coords
(%ld), dropping last value\n", i, path.size());//xxxx
path_size--;
}
for (int j = 0; j < path_size; j += 2) // vertex coords come
in pairs.
Index: libbase/tu_swap.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_swap.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libbase/tu_swap.h 8 May 2006 21:12:24 -0000 1.4
+++ libbase/tu_swap.h 27 Jul 2006 01:47:11 -0000 1.5
@@ -49,12 +49,17 @@
((u & 0xFF000000) >> 24);
}
+
#ifdef swap64
#undef swap64
#endif
inline uint64 swap64(uint64 u)
{
-#ifdef __GNUC__
+#if 0 //__GNUC__
+
+// Since we're now using exclusively C++, these C99 modifiers are no longer
+// necessary.
+
return ((u & 0x00000000000000FFLL) << 56) |
((u & 0x000000000000FF00LL) << 40) |
((u & 0x0000000000FF0000LL) << 24) |
Index: libbase/tu_timer.h
===================================================================
RCS file: /sources/gnash/gnash/libbase/tu_timer.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- libbase/tu_timer.h 20 Dec 2005 20:57:00 -0000 1.1
+++ libbase/tu_timer.h 27 Jul 2006 01:47:11 -0000 1.2
@@ -30,7 +30,7 @@
// Convert a hi-res ticks value into seconds.
double profile_ticks_to_seconds(uint64 profile_ticks);
-};
+}
#endif // TU_TIMER_H
Index: libgeometry/cull.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/cull.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libgeometry/cull.cpp 1 Feb 2006 23:58:32 -0000 1.2
+++ libgeometry/cull.cpp 27 Jul 2006 01:47:11 -0000 1.3
@@ -58,5 +58,5 @@
}
-}; // end namespace cull
+} // end namespace cull
Index: libgeometry/cull.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/cull.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- libgeometry/cull.h 8 May 2006 21:12:24 -0000 1.3
+++ libgeometry/cull.h 27 Jul 2006 01:47:11 -0000 1.4
@@ -25,7 +25,7 @@
result_info compute_box_visibility(const vec3& center, const vec3&
extent,
const plane_info frustum[6],
result_info in);
-};
+}
#endif // CULL_H
Index: libgeometry/geometry.cpp
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/geometry.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- libgeometry/geometry.cpp 1 Feb 2006 23:58:32 -0000 1.2
+++ libgeometry/geometry.cpp 27 Jul 2006 01:47:11 -0000 1.3
@@ -629,7 +629,7 @@
namespace Geometry {
-;
+
vec3 Rotate(float Angle, const vec3& Axis, const vec3& Point)
@@ -645,4 +645,4 @@
}
-};
+}
Index: libgeometry/geometry.h
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/geometry.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- libgeometry/geometry.h 30 Mar 2006 19:12:53 -0000 1.4
+++ libgeometry/geometry.h 27 Jul 2006 01:47:11 -0000 1.5
@@ -232,7 +232,7 @@
namespace Geometry {
vec3 Rotate(float Angle, const vec3& Axis, const vec3& Point);
-};
+}
Index: server/ActionExec.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/ActionExec.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/ActionExec.cpp 26 Jul 2006 09:19:48 -0000 1.17
+++ server/ActionExec.cpp 27 Jul 2006 01:47:11 -0000 1.18
@@ -131,7 +131,7 @@
#if DEBUG_STACK
if (dbglogfile.getActionDump()) {
- log_action("at ActionExec operator() start, pc=%zd,
stop_pc=%zd, code.size=%zd.", pc, stop_pc, code.size());
+ log_action("at ActionExec operator() start, pc=%ld,
stop_pc=%ld, code.size=%ld.", pc, stop_pc, code.size());
stringstream ss;
env.dump_stack(ss);
env.dump_global_registers(ss);
@@ -181,7 +181,7 @@
#if DEBUG_STACK
if (dbglogfile.getActionDump()) {
- log_action( " PC is now %zd.", pc);
+ log_action( " PC is now %ld.", pc);
stringstream ss;
env.dump_stack(ss);
env.dump_global_registers(ss);
@@ -199,7 +199,7 @@
}
-};
+}
// Local Variables:
Index: server/action.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action.cpp,v
retrieving revision 1.96
retrieving revision 1.97
diff -u -b -r1.96 -r1.97
--- server/action.cpp 10 Jul 2006 13:47:12 -0000 1.96
+++ server/action.cpp 27 Jul 2006 01:47:11 -0000 1.97
@@ -636,7 +636,7 @@
-};
+}
// Local Variables:
Index: server/action_buffer.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/action_buffer.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- server/action_buffer.cpp 17 Jul 2006 01:22:32 -0000 1.10
+++ server/action_buffer.cpp 27 Jul 2006 01:47:11 -0000 1.11
@@ -139,7 +139,7 @@
}
if (m_decl_dict_processed_at != -1) {
- log_error("process_decl_dict(%zd, %zd): decl_dict was already processed
at %d\n",
+ log_error("process_decl_dict(%ld, %ld): decl_dict was already processed
at %d\n",
start_pc,
stop_pc,
m_decl_dict_processed_at);
@@ -485,7 +485,7 @@
return u.d;
}
-};
+}
// Local Variables:
Index: server/array.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/array.cpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -b -r1.33 -r1.34
--- server/array.cpp 17 Jul 2006 01:22:32 -0000 1.33
+++ server/array.cpp 27 Jul 2006 01:47:11 -0000 1.34
@@ -842,4 +842,4 @@
}
-};
+}
Index: server/array.h
===================================================================
RCS file: /sources/gnash/gnash/server/array.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/array.h 10 Jul 2006 13:47:12 -0000 1.13
+++ server/array.h 27 Jul 2006 01:47:11 -0000 1.14
@@ -149,6 +149,6 @@
// needed by SWFHandlers::ActionInitArray
void array_new(const fn_call& fn);
-};
+}
#endif
Index: server/as_environment.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_environment.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/as_environment.cpp 7 Jul 2006 12:36:10 -0000 1.12
+++ server/as_environment.cpp 27 Jul 2006 01:47:11 -0000 1.13
@@ -308,7 +308,7 @@
if (reg > m_local_register.size())
{
log_error("Invalid local register %d, stack only has "
- "%zd entries\n",
+ "%ld entries\n",
reg, m_local_register.size());
return &m_global_register[0];
@@ -501,7 +501,7 @@
return md->get_version();
}
-};
+}
// Local Variables:
Index: server/as_value.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/as_value.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/as_value.cpp 7 Jul 2006 13:49:40 -0000 1.5
+++ server/as_value.cpp 27 Jul 2006 01:47:11 -0000 1.6
@@ -187,7 +187,7 @@
case C_FUNCTION:
snprintf(buffer, 50, "<c_function %p>",
- (void *) m_c_function_value);
+ (void *) &m_c_function_value);
m_string_value = buffer;
break;
@@ -462,7 +462,7 @@
}
-};
+}
// Local Variables:
Index: server/button.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/button.cpp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- server/button.cpp 24 Jul 2006 18:59:40 -0000 1.21
+++ server/button.cpp 27 Jul 2006 01:47:11 -0000 1.22
@@ -988,7 +988,7 @@
log_parse(" out_point = %d\n", m_out_point);
log_parse(" loop_count = %d\n", m_loop_count);
- log_parse(" envelope size = %zd\n", m_envelopes.size());
+ log_parse(" envelope size = %ld\n", m_envelopes.size());
}
@@ -1095,7 +1095,7 @@
return ch;
}
-};
+}
// Local Variables:
Index: server/button.h
===================================================================
RCS file: /sources/gnash/gnash/server/button.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- server/button.h 1 Jul 2006 20:44:10 -0000 1.8
+++ server/button.h 27 Jul 2006 01:47:11 -0000 1.9
@@ -148,7 +148,7 @@
void read(stream* in, int tag_type, movie_definition* m);
};
-}; // end namespace gnash
+} // end namespace gnash
#endif // GNASH_BUTTON_H
Index: server/character_def.h
===================================================================
RCS file: /sources/gnash/gnash/server/character_def.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/character_def.h 1 Jul 2006 20:44:10 -0000 1.7
+++ server/character_def.h 27 Jul 2006 01:47:11 -0000 1.8
@@ -50,7 +50,7 @@
class character;
struct cache_options;
//class sprite_instance;
-};
+}
namespace gnash {
Index: server/font.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/font.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- server/font.cpp 7 Jun 2006 03:03:21 -0000 1.13
+++ server/font.cpp 27 Jul 2006 01:47:11 -0000 1.14
@@ -445,7 +445,7 @@
}
-}; // end namespace gnash
+} // end namespace gnash
// Local Variables:
Index: server/fontlib.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/fontlib.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/fontlib.cpp 7 Jun 2006 03:03:21 -0000 1.11
+++ server/fontlib.cpp 27 Jul 2006 01:47:11 -0000 1.12
@@ -1143,7 +1143,7 @@
if (nf != (int) fonts.size())
{
// Font counts must match!
- log_error("mismatched font count (read %d, expected
%zd) in cached font data\n", nf, fonts.size());
+ log_error("mismatched font count (read %d, expected
%ld) in cached font data\n", nf, fonts.size());
in->go_to_end();
goto error_exit;
}
Index: server/render.h
===================================================================
RCS file: /sources/gnash/gnash/server/render.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/render.h 25 May 2006 11:08:36 -0000 1.3
+++ server/render.h 27 Jul 2006 01:47:11 -0000 1.4
@@ -92,9 +92,9 @@
const rect& coords,
const rect& uv_coords, rgba color);
- }; // end namespace render
+ } // end namespace render
-}; // end namespace gnash
+} // end namespace gnash
#endif // GNASH_RENDER_H
Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- server/shm.cpp 20 May 2006 23:49:33 -0000 1.11
+++ server/shm.cpp 27 Jul 2006 01:47:11 -0000 1.12
@@ -277,7 +277,7 @@
#endif // end of HAVE_SHM_OPEN
#endif // end of FLAT_ADDR_SPACE
- log_msg("Opened Shared Memory segment \"%s\": %zd bytes at %p.\n",
+ log_msg("Opened Shared Memory segment \"%s\": %ld bytes at %p.\n",
filespec, _size, _addr);
}
Index: server/stream.h
===================================================================
RCS file: /sources/gnash/gnash/server/stream.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- server/stream.h 25 May 2006 12:07:48 -0000 1.7
+++ server/stream.h 27 Jul 2006 01:47:11 -0000 1.8
@@ -91,7 +91,7 @@
};
-}; // end namespace gnash
+} // end namespace gnash
#endif // GNASH_STREAM_H
Index: server/tesselate.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/tesselate.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- server/tesselate.cpp 25 Feb 2006 03:54:03 -0000 1.5
+++ server/tesselate.cpp 27 Jul 2006 01:47:11 -0000 1.6
@@ -545,7 +545,7 @@
} // end namespace tesselate
-}; // end namespace gnash
+} // end namespace gnash
// Local Variables:
Index: server/tesselate.h
===================================================================
RCS file: /sources/gnash/gnash/server/tesselate.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- server/tesselate.h 8 May 2006 13:59:07 -0000 1.3
+++ server/tesselate.h 27 Jul 2006 01:47:11 -0000 1.4
@@ -58,8 +58,8 @@
trapezoid_accepter *accepter) const = 0;
};
-}; // end namespace tesselate
-};// end namespace gnash
+} // end namespace tesselate
+}// end namespace gnash
#endif // GNASH_TESSELATE_H
Index: server/timers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/timers.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/timers.cpp 7 Jul 2006 13:49:40 -0000 1.12
+++ server/timers.cpp 27 Jul 2006 01:47:11 -0000 1.13
@@ -149,7 +149,7 @@
// FIXME: Sometimes, "now" and "_start" have bad values.
// I don't know why, but this works around the problem..
else if (now < _start) {
- log_msg( "Timer::expired - now (%lf) is before start (%lf)!\n"
+ log_msg( "Timer::expired - now (%f) is before start (%f)!\n"
" Expiring right now.\n",
now, _start);
_start = now;
Index: server/types.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/types.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/types.cpp 7 Jun 2006 03:03:21 -0000 1.6
+++ server/types.cpp 27 Jul 2006 01:47:11 -0000 1.7
@@ -574,7 +574,7 @@
}
-}; // end namespace gnash
+} // end namespace gnash
// Local Variables:
Index: server/types.h
===================================================================
RCS file: /sources/gnash/gnash/server/types.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- server/types.h 7 Jun 2006 03:03:21 -0000 1.6
+++ server/types.h 27 Jul 2006 01:47:11 -0000 1.7
@@ -17,7 +17,7 @@
extern bool s_verbose_action;
extern bool s_verbose_parse;
extern bool s_verbose_debug;
-};
+}
#define TWIPS_TO_PIXELS(x) ((x) / 20.f)
@@ -83,7 +83,7 @@
};
-}; // end namespace gnash
+} // end namespace gnash
#endif // __TYPES_H__
Index: server/xmlnode.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/xmlnode.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- server/xmlnode.cpp 7 Jul 2006 13:49:40 -0000 1.12
+++ server/xmlnode.cpp 27 Jul 2006 01:47:11 -0000 1.13
@@ -276,7 +276,7 @@
as_object *
XMLNode::previousSibling(int x)
{
- log_msg("%s: partially implemented. %zd objects\n",
+ log_msg("%s: partially implemented. %ld objects\n",
__PRETTY_FUNCTION__, _objects.size());
if (_objects.size() > 0) {
return _objects[x-1];
Index: server/asobj/Math.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Math.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- server/asobj/Math.cpp 22 Jul 2006 23:47:56 -0000 1.1
+++ server/asobj/Math.cpp 27 Jul 2006 01:47:11 -0000 1.2
@@ -174,18 +174,18 @@
}
#endif
-MATH_WRAP_FUNC1(fabs);
-MATH_WRAP_FUNC1(acos);
-MATH_WRAP_FUNC1(asin);
-MATH_WRAP_FUNC1(atan);
-MATH_WRAP_FUNC1(ceil);
-MATH_WRAP_FUNC1(cos);
-MATH_WRAP_FUNC1(exp);
-MATH_WRAP_FUNC1(floor);
-MATH_WRAP_FUNC1(log);
-MATH_WRAP_FUNC1(sin);
-MATH_WRAP_FUNC1(sqrt);
-MATH_WRAP_FUNC1(tan);
+MATH_WRAP_FUNC1(fabs)
+MATH_WRAP_FUNC1(acos)
+MATH_WRAP_FUNC1(asin)
+MATH_WRAP_FUNC1(atan)
+MATH_WRAP_FUNC1(ceil)
+MATH_WRAP_FUNC1(cos)
+MATH_WRAP_FUNC1(exp)
+MATH_WRAP_FUNC1(floor)
+MATH_WRAP_FUNC1(log)
+MATH_WRAP_FUNC1(sin)
+MATH_WRAP_FUNC1(sqrt)
+MATH_WRAP_FUNC1(tan)
#if 0
// Two-argument functions.
@@ -206,10 +206,10 @@
fn.result->set_double(expr);
\
}
#endif
-MATH_WRAP_FUNC2_EXP(atan2, (atan2(arg0, arg1)));
-MATH_WRAP_FUNC2_EXP(max, (arg0 > arg1 ? arg0 : arg1));
-MATH_WRAP_FUNC2_EXP(min, (arg0 < arg1 ? arg0 : arg1));
-MATH_WRAP_FUNC2_EXP(pow, (pow(arg0, arg1)));
+MATH_WRAP_FUNC2_EXP(atan2, (atan2(arg0, arg1)))
+MATH_WRAP_FUNC2_EXP(max, (arg0 > arg1 ? arg0 : arg1))
+MATH_WRAP_FUNC2_EXP(min, (arg0 < arg1 ? arg0 : arg1))
+MATH_WRAP_FUNC2_EXP(pow, (pow(arg0, arg1)))
// A couple of oddballs.
void math_random(const fn_call& fn)
Index: server/swf/ASHandlers.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/ASHandlers.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- server/swf/ASHandlers.cpp 26 Jul 2006 21:49:06 -0000 1.38
+++ server/swf/ASHandlers.cpp 27 Jul 2006 01:47:11 -0000 1.39
@@ -700,7 +700,7 @@
size_t tag_len = code.read_int16(thread.pc+1);
if ( tag_len != 3 )
{
- log_warning("Malformed SWF: ActionWaitForFrame (0x%X) tag
length == %zd (expected 3)", SWF::ACTION_WAITFORFRAME, tag_len);
+ log_warning("Malformed SWF: ActionWaitForFrame (0x%X) tag
length == %ld (expected 3)", SWF::ACTION_WAITFORFRAME, tag_len);
}
// we don't use the stack!
@@ -1564,8 +1564,8 @@
if (next_pc > stop_pc)
{
- log_error("branch to offset %zd -- "
- " this section only runs to %zd. "
+ log_error("branch to offset %ld -- "
+ " this section only runs to %ld. "
" Malformed SWF !.\n",
next_pc,
stop_pc);
@@ -2659,7 +2659,7 @@
size_t pc = thread.pc;
size_t next_pc = thread.next_pc;
- log_action("-------------- with block start: stack size is %zd\n",
+ log_action("-------------- with block start: stack size is %ld\n",
with_stack.size());
if (with_stack.size() < 8)
@@ -2794,7 +2794,7 @@
{
if ( static_cast<size_t>(x) > _handlers.size() )
{
- log_error("at SWFHandlers::action_name(%d) call time, _handlers
size is %zd", x, _handlers.size());
+ log_error("at SWFHandlers::action_name(%d) call time, _handlers
size is %ld", x, _handlers.size());
return NULL;
}
else
@@ -2811,8 +2811,8 @@
size_t missing = required-env.stack_size();
- log_error("Stack underrun: %zd elements required, %zd available. "
- "Fixing by pushing %zd undefined values on the missing slots.",
+ log_error("Stack underrun: %ld elements required, %ld available. "
+ "Fixing by pushing %ld undefined values on the missing slots.",
required, env.stack_size(), missing);
for (size_t i=0; i<missing; ++i)
Index: server/swf/tag_loaders.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/swf/tag_loaders.cpp,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- server/swf/tag_loaders.cpp 17 Jul 2006 01:22:32 -0000 1.17
+++ server/swf/tag_loaders.cpp 27 Jul 2006 01:47:11 -0000 1.18
@@ -873,7 +873,7 @@
if (action.get_length() != event_length)
{
- log_error("error --
swf_event::read(), event_length = %d, but read %zd\n",
+ log_error("error --
swf_event::read(), event_length = %d, but read %ld\n",
event_length,
action.get_length());
break;
}
- [Gnash-commit] gnash ChangeLog libbase/container.h libbase/cur...,
Bastiaan Jacques <=