Commite541d12

authored

Merge pull request#2092 from janhq/fix/exception_handling_by_ref

fix: Exception Handling and multiline comment

2 parentsce5cbe8 +236beb7 commite541d12Copy full SHA for e541d12

File tree

-6

lines changed

engine
- common
  - message_content_text.h
- utils/hardware/gguf
  - gguf_file.h

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,7 @@ struct Text : JsonSerializable {`
`192`	`192`	`}`
`193`	`193`	`json["annotations"] = annotations_json_arr;`
`194`	`194`	`return json;`
`195`		`- }catch (const std::exception e) {`
	`195`	`+ }catch (const std::exception&e) {`
`196`	`196`	`returncpp::fail(std::string("ToJson failed:") + e.what());`
`197`	`197`	`}`
`198`	`198`	`};`

Lines changed: 6 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -25,11 +25,12 @@`
`25`	`25`	`#include"ggml.h"`
`26`	`26`	`#include"utils/logging_utils.h"`
`27`	`27`	`#include"utils/string_utils.h"`
`28`		`-`
`29`		`-// #define GGUF_LOG(msg) \`
`30`		`-// do { \`
`31`		`-// std::cout << __FILE__ << "(@" << __LINE__ << "): " << msg << '\n'; \`
`32`		`-// } while (false)`
	`28`	`+/*`
	`29`	`+#define GGUF_LOG(msg) \`
	`30`	`+ do { \`
	`31`	`+ std::cout << __FILE__ << "(@" << __LINE__ << "): " << msg << '\n'; \`
	`32`	`+ } while (false)`
	`33`	`+*/`
`33`	`34`
`34`	`35`	`#defineGGUF_LOG(msg)`
`35`	`36`	`namespacehardware {`

Comments

(0)