src: squelch unused function warnings in util.h

solebox · jasnell · commit 35d48d3e1051 · 2016-11-18T08:29:56.000-08:00
Fixes: nodejs#9083 PR-URL: nodejs#9115 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
diff --git a/src/util-inl.h b/src/util-inl.h
@@ -357,39 +357,45 @@ T* UncheckedRealloc(T* pointer, size_t n) {
 
 // As per spec realloc behaves like malloc if passed nullptr.
 template <typename T>
-T* UncheckedMalloc(size_t n) {
+inline T* UncheckedMalloc(size_t n) {
   if (n == 0) n = 1;
   return UncheckedRealloc<T>(nullptr, n);
 }
 
 template <typename T>
-T* UncheckedCalloc(size_t n) {
+inline T* UncheckedCalloc(size_t n) {
   if (n == 0) n = 1;
   MultiplyWithOverflowCheck(sizeof(T), n);
   return static_cast<T*>(calloc(n, sizeof(T)));
 }
 
 template <typename T>
-T* Realloc(T* pointer, size_t n) {
+inline T* Realloc(T* pointer, size_t n) {
   T* ret = UncheckedRealloc(pointer, n);
   if (n > 0) CHECK_NE(ret, nullptr);
   return ret;
 }
 
 template <typename T>
-T* Malloc(size_t n) {
+inline T* Malloc(size_t n) {
   T* ret = UncheckedMalloc<T>(n);
   if (n > 0) CHECK_NE(ret, nullptr);
   return ret;
 }
 
 template <typename T>
-T* Calloc(size_t n) {
+inline T* Calloc(size_t n) {
   T* ret = UncheckedCalloc<T>(n);
   if (n > 0) CHECK_NE(ret, nullptr);
   return ret;
 }
 
+// Shortcuts for char*.
+inline char* Malloc(size_t n) { return Malloc<char>(n); }
+inline char* Calloc(size_t n) { return Calloc<char>(n); }
+inline char* UncheckedMalloc(size_t n) { return UncheckedMalloc<char>(n); }
+inline char* UncheckedCalloc(size_t n) { return UncheckedCalloc<char>(n); }
+
 }  // namespace node
 
 #endif  // defined(NODE_WANT_INTERNALS) && NODE_WANT_INTERNALS
diff --git a/src/util.h b/src/util.h
@@ -38,11 +38,10 @@ inline T* Malloc(size_t n);
 template <typename T>
 inline T* Calloc(size_t n);
 
-// Shortcuts for char*.
-inline char* Malloc(size_t n) { return Malloc<char>(n); }
-inline char* Calloc(size_t n) { return Calloc<char>(n); }
-inline char* UncheckedMalloc(size_t n) { return UncheckedMalloc<char>(n); }
-inline char* UncheckedCalloc(size_t n) { return UncheckedCalloc<char>(n); }
+inline char* Malloc(size_t n);
+inline char* Calloc(size_t n);
+inline char* UncheckedMalloc(size_t n);
+inline char* UncheckedCalloc(size_t n);
 
 // Used by the allocation functions when allocation fails.
 // Thin wrapper around v8::Isolate::LowMemoryNotification() that checks
