merge 384146 386833
tags 384146 patch
tags 386833 patch
thanks for all the fish
---
Attached is a patch which gets the package building again.
Basically I split the ENUM_DEFINITION macro into a ENUM_DEFINITION_BEGIN
and a ENUM_DEFINITION_END so that the enums can be defined by the _BEGIN
and instantiated by the _END.
Thanks,
stew
Only in plptools-0.15.orig/debian: klipsi.1.in
Only in plptools-0.15.orig/debian: kpsion.1.in
Only in plptools-0.15.orig/etc: plptools.spec
Only in plptools-0.15.orig/include: config.h
Only in plptools-0.15.orig/include: config.h.in~
Only in plptools-0.15.orig/kde2/doc/de: index.cache.bz2
Only in plptools-0.15.orig/kde2/doc/en: index.cache.bz2
Only in plptools-0.15.orig/kde2/klipsi: dummy.cpp
diff -ru plptools-0.15.orig/lib/Enum.h plptools-0.15/lib/Enum.h
--- plptools-0.15.orig/lib/Enum.h 2005-08-06 08:10:18.000000000 -0400
+++ plptools-0.15/lib/Enum.h 2006-09-22 01:41:15.000000000 -0400
@@ -304,14 +304,16 @@
* The definition of the static variable holding the static
* data for this Enumeration wrapper.
*/
-#define ENUM_DEFINITION(EnumName, initWith) \
-template Enum< EnumName >::sdata Enum< EnumName >::staticData; \
+#define ENUM_DEFINITION_BEGIN(EnumName, initWith) \
/** \
* actual definition of the constructor for the static data. \
* This is called implicitly by the definition above. \
*/ \
template <> Enum<EnumName>::sdata::sdata() : \
-name(#EnumName),defaultValue(initWith)
+ name(#EnumName),defaultValue(initWith) {
+
+#define ENUM_DEFINITION_END(EnumName) \
+} template Enum< EnumName >::sdata Enum< EnumName >::staticData;
/**
* Writes enumeration's string representation.
diff -ru plptools-0.15.orig/lib/rfsv.cc plptools-0.15/lib/rfsv.cc
--- plptools-0.15.orig/lib/rfsv.cc 2004-05-31 09:37:08.000000000 -0400
+++ plptools-0.15/lib/rfsv.cc 2006-09-22 01:42:32.000000000 -0400
@@ -33,7 +33,7 @@
using namespace std;
-ENUM_DEFINITION(rfsv::errs, rfsv::E_PSI_GEN_NONE) {
+ENUM_DEFINITION_BEGIN(rfsv::errs, rfsv::E_PSI_GEN_NONE)
stringRep.add(rfsv::E_PSI_GEN_NONE, N_("no error"));
stringRep.add(rfsv::E_PSI_GEN_FAIL, N_("general"));
stringRep.add(rfsv::E_PSI_GEN_ARG, N_("bad argument"));
@@ -108,7 +108,8 @@
stringRep.add(rfsv::E_PSI_FILE_HANDLE, N_("bad handle"));
stringRep.add(rfsv::E_PSI_NOT_SIBO, N_("invalid operation for RFSV16"));
stringRep.add(rfsv::E_PSI_INTERNAL, N_("libplp internal error"));
-}
+ENUM_DEFINITION_END(rfsv::errs)
+
const char *rfsv::getConnectName(void) {
return "SYS$RFSV";
diff -ru plptools-0.15.orig/lib/rfsvfactory.cc plptools-0.15/lib/rfsvfactory.cc
--- plptools-0.15.orig/lib/rfsvfactory.cc 2004-05-31 09:37:08.000000000 -0400
+++ plptools-0.15/lib/rfsvfactory.cc 2006-09-22 01:44:18.000000000 -0400
@@ -37,14 +37,14 @@
using namespace std;
-ENUM_DEFINITION(rfsvfactory::errs, rfsvfactory::FACERR_NONE) {
+ENUM_DEFINITION_BEGIN(rfsvfactory::errs, rfsvfactory::FACERR_NONE)
stringRep.add(rfsvfactory::FACERR_NONE, N_("no error"));
stringRep.add(rfsvfactory::FACERR_COULD_NOT_SEND, N_("could not send version request"));
stringRep.add(rfsvfactory::FACERR_AGAIN, N_("try again"));
stringRep.add(rfsvfactory::FACERR_NOPSION, N_("no psion connected"));
stringRep.add(rfsvfactory::FACERR_PROTVERSION, N_("wrong protocol version"));
stringRep.add(rfsvfactory::FACERR_NORESPONSE, N_("no response from ncpd"));
-}
+ENUM_DEFINITION_END(rfsvfactory::errs)
rfsvfactory::rfsvfactory(ppsocket *_skt) : serNum(0)
{
diff -ru plptools-0.15.orig/lib/rpcs.cc plptools-0.15/lib/rpcs.cc
--- plptools-0.15.orig/lib/rpcs.cc 2006-05-01 16:35:50.000000000 -0400
+++ plptools-0.15/lib/rpcs.cc 2006-09-22 01:44:29.000000000 -0400
@@ -37,7 +37,7 @@
using namespace std;
-ENUM_DEFINITION(rpcs::machs, rpcs::PSI_MACH_UNKNOWN) {
+ENUM_DEFINITION_BEGIN(rpcs::machs, rpcs::PSI_MACH_UNKNOWN)
stringRep.add(rpcs::PSI_MACH_UNKNOWN, N_("Unknown device"));
stringRep.add(rpcs::PSI_MACH_PC, N_("PC"));
stringRep.add(rpcs::PSI_MACH_MC, N_("MC"));
@@ -49,16 +49,17 @@
stringRep.add(rpcs::PSI_MACH_S3C, N_("Series 3c"));
stringRep.add(rpcs::PSI_MACH_S5, N_("Series 5"));
stringRep.add(rpcs::PSI_MACH_WINC, N_("WinC"));
-}
+ENUM_DEFINITION_END(rpcs::machs)
-ENUM_DEFINITION(rpcs::batterystates, rpcs::PSI_BATT_DEAD) {
+ENUM_DEFINITION_BEGIN(rpcs::batterystates, rpcs::PSI_BATT_DEAD)
stringRep.add(rpcs::PSI_BATT_DEAD, N_("Empty"));
stringRep.add(rpcs::PSI_BATT_VERYLOW, N_("Very Low"));
stringRep.add(rpcs::PSI_BATT_LOW, N_("Low"));
stringRep.add(rpcs::PSI_BATT_GOOD, N_("Good"));
-}
+ENUM_DEFINITION_END(rpcs::batterystates)
-ENUM_DEFINITION(rpcs::languages, rpcs::PSI_LANG_TEST) {
+
+ENUM_DEFINITION_BEGIN(rpcs::languages, rpcs::PSI_LANG_TEST)
stringRep.add(rpcs::PSI_LANG_TEST, N_("Test"));
stringRep.add(rpcs::PSI_LANG_en_GB, N_("English"));
stringRep.add(rpcs::PSI_LANG_de_DE, N_("German"));
@@ -88,7 +89,7 @@
stringRep.add(rpcs::PSI_LANG_sk_SK, N_("Slovak"));
stringRep.add(rpcs::PSI_LANG_pl_PL, N_("Polish"));
stringRep.add(rpcs::PSI_LANG_sl_SI, N_("Slovenian"));
-}
+ENUM_DEFINITION_END(rpcs::languages)
rpcs::~rpcs()
{
diff -ru plptools-0.15.orig/lib/rpcsfactory.cc plptools-0.15/lib/rpcsfactory.cc
--- plptools-0.15.orig/lib/rpcsfactory.cc 2004-05-31 09:37:08.000000000 -0400
+++ plptools-0.15/lib/rpcsfactory.cc 2006-09-22 01:44:55.000000000 -0400
@@ -34,14 +34,14 @@
#include <stdlib.h>
#include <time.h>
-ENUM_DEFINITION(rpcsfactory::errs, rpcsfactory::FACERR_NONE) {
+ENUM_DEFINITION_BEGIN(rpcsfactory::errs, rpcsfactory::FACERR_NONE)
stringRep.add(rpcsfactory::FACERR_NONE, N_("no error"));
stringRep.add(rpcsfactory::FACERR_COULD_NOT_SEND, N_("could not send version request"));
stringRep.add(rpcsfactory::FACERR_AGAIN, N_("try again"));
stringRep.add(rpcsfactory::FACERR_NOPSION, N_("no psion connected"));
stringRep.add(rpcsfactory::FACERR_PROTVERSION, N_("wrong protocol version"));
stringRep.add(rpcsfactory::FACERR_NORESPONSE, N_("no response from ncpd"));
-}
+ENUM_DEFINITION_END(rpcsfactory::errs)
rpcsfactory::rpcsfactory(ppsocket *_skt)
{
diff -ru plptools-0.15.orig/ncpd/link.cc plptools-0.15/ncpd/link.cc
--- plptools-0.15.orig/ncpd/link.cc 2004-05-31 09:37:09.000000000 -0400
+++ plptools-0.15/ncpd/link.cc 2006-09-22 01:49:26.000000000 -0400
@@ -55,11 +55,11 @@
using namespace std;
-ENUM_DEFINITION(Link::link_type, Link::LINK_TYPE_UNKNOWN) {
+ENUM_DEFINITION_BEGIN(Link::link_type, Link::LINK_TYPE_UNKNOWN)
stringRep.add(Link::LINK_TYPE_UNKNOWN, N_("Unknown"));
stringRep.add(Link::LINK_TYPE_SIBO, N_("SIBO"));
stringRep.add(Link::LINK_TYPE_EPOC, N_("EPOC"));
-}
+ENUM_DEFINITION_END(Link::link_type)
Link::Link(const char *fname, int baud, ncp *_ncp, unsigned short _verbose)
: p(0)
