use deleter functor for common_chat_templates_ptr

Author: Olivier Chafik

common/chat.cpp

@@ -411,7 +411,7 @@ common_chat_templates_ptr common_chat_templates_init(
         token_bos = get_token(llama_vocab_bos(vocab), "BOS", "bos_token");
         token_eos = get_token(llama_vocab_eos(vocab), "EOS", "eos_token");
     }
-    common_chat_templates_ptr tmpls(new common_chat_templates(), common_chat_templates_free);
+    common_chat_templates_ptr tmpls(new common_chat_templates());
     tmpls->has_explicit_template = has_explicit_template;
     try {
         tmpls->template_default = std::make_unique<minja::chat_template>(default_template_src, token_bos, token_eos);

common/chat.h

@@ -85,9 +85,11 @@ struct common_chat_params {
 // Check if the template supplied via "--chat-template" is supported or not. Returns true if it's valid
 bool common_chat_verify_template(const std::string & tmpl, bool use_jinja);
 
-
 void common_chat_templates_free(struct common_chat_templates * tmpls);
-typedef std::unique_ptr<struct common_chat_templates, decltype(&common_chat_templates_free)> common_chat_templates_ptr;
+
+struct common_chat_templates_deleter { void operator()(common_chat_templates * tmpls) { common_chat_templates_free(tmpls); } };
+
+typedef std::unique_ptr<struct common_chat_templates, common_chat_templates_deleter> common_chat_templates_ptr;
 
 common_chat_templates_ptr common_chat_templates_init(
                                     const struct llama_model * model,

examples/server/server.cpp

@@ -1806,8 +1806,6 @@ struct server_context {
 
     common_chat_templates_ptr chat_templates;
 
-    server_context() : chat_templates(nullptr, nullptr) {}
-
     ~server_context() {
         // Clear any sampling context
         for (server_slot & slot : slots) {