restored Awk.hpp from ::size_t to size_t
This commit is contained in:
53
ase/configure
vendored
53
ase/configure
vendored
@ -1987,7 +1987,6 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var.
|
||||
|
||||
|
||||
|
||||
# Does compilation test using CC and CPP with extension .c for test programs.
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@ -1995,7 +1994,6 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $
|
||||
ac_compiler_gnu=$ac_cv_c_compiler_gnu
|
||||
|
||||
|
||||
# Initializes automake
|
||||
am__api_version='1.10'
|
||||
|
||||
# Find a good install program. We prefer a C program (faster),
|
||||
@ -2449,7 +2447,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
|
||||
|
||||
|
||||
|
||||
# Determines a C compiler to use
|
||||
ac_ext=c
|
||||
ac_cpp='$CPP $CPPFLAGS'
|
||||
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@ -3540,7 +3537,6 @@ fi
|
||||
|
||||
|
||||
|
||||
# Determines a C++ compiler to use
|
||||
ac_ext=cpp
|
||||
ac_cpp='$CXXCPP $CPPFLAGS'
|
||||
ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
|
||||
@ -4013,7 +4009,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# Checks the C++ compiler exists in PATH.
|
||||
|
||||
# Extract the first word of "$CXX", so it can be a program name with args.
|
||||
set dummy $CXX; ac_word=$2
|
||||
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
|
||||
@ -4861,7 +4857,7 @@ ia64-*-hpux*)
|
||||
;;
|
||||
*-*-irix6*)
|
||||
# Find out which ABI we are using.
|
||||
echo '#line 4864 "configure"' > conftest.$ac_ext
|
||||
echo '#line 4860 "configure"' > conftest.$ac_ext
|
||||
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
|
||||
(eval $ac_compile) 2>&5
|
||||
ac_status=$?
|
||||
@ -7446,11 +7442,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7449: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7445: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7453: \$? = $ac_status" >&5
|
||||
echo "$as_me:7449: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7736,11 +7732,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7739: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7735: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:7743: \$? = $ac_status" >&5
|
||||
echo "$as_me:7739: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -7840,11 +7836,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:7843: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:7839: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:7847: \$? = $ac_status" >&5
|
||||
echo "$as_me:7843: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -10217,7 +10213,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10220 "configure"
|
||||
#line 10216 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -10317,7 +10313,7 @@ else
|
||||
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
|
||||
lt_status=$lt_dlunknown
|
||||
cat > conftest.$ac_ext <<EOF
|
||||
#line 10320 "configure"
|
||||
#line 10316 "configure"
|
||||
#include "confdefs.h"
|
||||
|
||||
#if HAVE_DLFCN_H
|
||||
@ -12718,11 +12714,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12721: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12717: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:12725: \$? = $ac_status" >&5
|
||||
echo "$as_me:12721: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -12822,11 +12818,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:12825: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:12821: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:12829: \$? = $ac_status" >&5
|
||||
echo "$as_me:12825: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -14420,11 +14416,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14423: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14419: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:14427: \$? = $ac_status" >&5
|
||||
echo "$as_me:14423: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -14524,11 +14520,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:14527: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:14523: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:14531: \$? = $ac_status" >&5
|
||||
echo "$as_me:14527: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -16744,11 +16740,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:16747: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:16743: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:16751: \$? = $ac_status" >&5
|
||||
echo "$as_me:16747: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -17034,11 +17030,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17037: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17033: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>conftest.err)
|
||||
ac_status=$?
|
||||
cat conftest.err >&5
|
||||
echo "$as_me:17041: \$? = $ac_status" >&5
|
||||
echo "$as_me:17037: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s "$ac_outfile"; then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
# So say no if there are warnings other than the usual output.
|
||||
@ -17138,11 +17134,11 @@ else
|
||||
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
|
||||
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
|
||||
-e 's:$: $lt_compiler_flag:'`
|
||||
(eval echo "\"\$as_me:17141: $lt_compile\"" >&5)
|
||||
(eval echo "\"\$as_me:17137: $lt_compile\"" >&5)
|
||||
(eval "$lt_compile" 2>out/conftest.err)
|
||||
ac_status=$?
|
||||
cat out/conftest.err >&5
|
||||
echo "$as_me:17145: \$? = $ac_status" >&5
|
||||
echo "$as_me:17141: \$? = $ac_status" >&5
|
||||
if (exit $ac_status) && test -s out/conftest2.$ac_objext
|
||||
then
|
||||
# The compiler can only warn and ignore the option if not recognized
|
||||
@ -20312,7 +20308,6 @@ else
|
||||
fi
|
||||
|
||||
|
||||
# Overrides the default CFLAGS setting
|
||||
if test "$ac_test_CFLAGS" = "set"
|
||||
then
|
||||
CFLAGS=$ac_save_CFLAGS
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: Awk.hpp 430 2008-10-17 11:43:20Z baconevi $
|
||||
* $Id: Awk.hpp 449 2008-10-31 10:32:28Z baconevi $
|
||||
*
|
||||
* {License}
|
||||
*/
|
||||
@ -11,7 +11,6 @@
|
||||
#include <ase/cmn/map.h>
|
||||
#include <ase/cmn/chr.h>
|
||||
#include <stdarg.h>
|
||||
#include <stddef.h>
|
||||
|
||||
/////////////////////////////////
|
||||
ASE_BEGIN_NAMESPACE(ASE)
|
||||
@ -324,10 +323,8 @@ public:
|
||||
|
||||
public:
|
||||
// initialization
|
||||
//void* operator new (size_t n, awk_t* awk) throw ();
|
||||
//void* operator new[] (size_t n, awk_t* awk) throw ();
|
||||
void* operator new (::size_t n, awk_t* awk) throw ();
|
||||
void* operator new[] (::size_t n, awk_t* awk) throw ();
|
||||
void* operator new (size_t n, awk_t* awk) throw ();
|
||||
void* operator new[] (size_t n, awk_t* awk) throw ();
|
||||
|
||||
#if !defined(__BORLANDC__)
|
||||
// deletion when initialization fails
|
||||
|
||||
@ -528,9 +528,11 @@ ps: ps-recursive
|
||||
ps-am:
|
||||
|
||||
uninstall-am: uninstall-pkgincludeHEADERS
|
||||
@$(NORMAL_INSTALL)
|
||||
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
|
||||
|
||||
.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
|
||||
install-data-am install-strip
|
||||
install-data-am install-strip uninstall-am
|
||||
|
||||
.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
|
||||
all all-am check check-am clean clean-generic clean-libtool \
|
||||
@ -545,12 +547,16 @@ uninstall-am: uninstall-pkgincludeHEADERS
|
||||
installcheck-am installdirs installdirs-am maintainer-clean \
|
||||
maintainer-clean-generic mostlyclean mostlyclean-generic \
|
||||
mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
|
||||
uninstall uninstall-am uninstall-pkgincludeHEADERS
|
||||
uninstall uninstall-am uninstall-hook \
|
||||
uninstall-pkgincludeHEADERS
|
||||
|
||||
|
||||
install-data-hook:
|
||||
@"$(GREP)" -E "#define[ ]+ASE_" "$(srcdir)/config.h" > "$(pkgincludedir)/config.h"
|
||||
@"$(RM)" -f "$(pkgincludedir)/config.h.in"
|
||||
|
||||
uninstall-hook:
|
||||
@"$(RM)" -f "$(pkgincludedir)/config.h"
|
||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||
.NOEXPORT:
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
/*
|
||||
* $Id: Awk.cpp 430 2008-10-17 11:43:20Z baconevi $
|
||||
* $Id: Awk.cpp 449 2008-10-31 10:32:28Z baconevi $
|
||||
*
|
||||
* {License}
|
||||
*/
|
||||
@ -229,7 +229,7 @@ void Awk::Argument::clear ()
|
||||
this->inum = 0;
|
||||
}
|
||||
|
||||
void* Awk::Argument::operator new (::size_t n, awk_t* awk) throw ()
|
||||
void* Awk::Argument::operator new (size_t n, awk_t* awk) throw ()
|
||||
{
|
||||
void* ptr = ase_awk_alloc (awk, ASE_SIZEOF(awk) + n);
|
||||
if (ptr == ASE_NULL) return ASE_NULL;
|
||||
@ -238,7 +238,7 @@ void* Awk::Argument::operator new (::size_t n, awk_t* awk) throw ()
|
||||
return (char*)ptr+ASE_SIZEOF(awk);
|
||||
}
|
||||
|
||||
void* Awk::Argument::operator new[] (::size_t n, awk_t* awk) throw ()
|
||||
void* Awk::Argument::operator new[] (size_t n, awk_t* awk) throw ()
|
||||
{
|
||||
void* ptr = ase_awk_alloc (awk, ASE_SIZEOF(awk) + n);
|
||||
if (ptr == ASE_NULL) return ASE_NULL;
|
||||
|
||||
Reference in New Issue
Block a user