diff options
Diffstat (limited to 'icetray/tool')
| -rw-r--r-- | icetray/tool/embed.sql.cpp.m4 | 3 | ||||
| -rw-r--r-- | icetray/tool/embed.sql.h.m4 | 9 |
2 files changed, 3 insertions, 9 deletions
diff --git a/icetray/tool/embed.sql.cpp.m4 b/icetray/tool/embed.sql.cpp.m4 index c150b4d..28a9747 100644 --- a/icetray/tool/embed.sql.cpp.m4 +++ b/icetray/tool/embed.sql.cpp.m4 @@ -1,7 +1,6 @@ changecom(`@@') #include "NAME.sql.h" -const std::string NAMESPACE::NAME::sql({ +const IceTray::StaticSqlSource NAMESPACE::NAME ({ patsubst(esyscmd(`xxd -p -c 12 ' SQL), `\(..\)', `0x\1, ')0x0a}); -const std::size_t NAMESPACE::NAME::hash(std::hash<std::string>()(sql)); diff --git a/icetray/tool/embed.sql.h.m4 b/icetray/tool/embed.sql.h.m4 index fbabf62..e8ccee7 100644 --- a/icetray/tool/embed.sql.h.m4 +++ b/icetray/tool/embed.sql.h.m4 @@ -2,14 +2,9 @@ define(`foreach',`ifelse(eval($#>2),1, `pushdef(`$1',`$3')$2`'popdef(`$1') `'ifelse(eval($#>3),1,`$0(`$1',`$2',shift(shift(shift($@))))')')') define(NAMESPACEC,`patsubst(NAMESPACE,`::', `,')') -#include <functional> -#include <string> +#include <staticSqlSource.h> foreach(`ns', `namespace ns { ', NAMESPACEC) - class NAME { - public: - static const std::string sql; - static const std::size_t hash; - }; + extern const IceTray::StaticSqlSource NAME; foreach(`ns', `}', NAMESPACEC) |