diff --git a/ChangeLog b/ChangeLog
index d245ad6c..8b30e95d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-04-13  Akim Demaille  <demaille@gostai.com>
+
+	tests: don't depend on the actual location type.
+	* tests/calc.at: Use yy::parser::location_type rather than
+	yy::location, since the former is always right, and might point to
+	another type than the latter.
+
 2010-04-13  Akim Demaille  <demaille@gostai.com>
 
 	formatting changes.
diff --git a/tests/calc.at b/tests/calc.at
index 6735e85a..aa1d5e3c 100644
--- a/tests/calc.at
+++ b/tests/calc.at
@@ -176,7 +176,7 @@ typedef int semantic_value;
 /* The input.  */
 extern FILE *input;]AT_SKEL_CC_IF([[
 #ifndef YYLTYPE
-# define YYLTYPE ]AT_NAME_PREFIX[::location
+# define YYLTYPE ]AT_NAME_PREFIX[::parser::location_type
 #endif
 #define first_line   begin.line
 #define first_column begin.column
@@ -269,7 +269,7 @@ exp:
 ]AT_SKEL_CC_IF(
 [/* A C++ error reporting function.  */
 void
-AT_NAME_PREFIX::parser::error (const location& l, const std::string& m)
+AT_NAME_PREFIX::parser::error (const location_type& l, const std::string& m)
 {
   (void) l;
   std::cerr << AT_LOCATION_IF([l << ": " << ])m << std::endl;