begin work on ray tracer project

[chaz/rasterize] / common.hh

diff --git a/common.h b/common.hh
similarity index 96%
rename from common.h
rename to common.hh
index ec7913ea4b13853d1880611bf02e877348f476d8..66aefd90399764a0de63e796aa53da39dabdb0e0 100644 (file)
--- a/common.h
+++ b/common.hh
@@ -5,17 +5,16 @@
  * mcgarvey@eng.utah.edu
  */
 
-#ifndef _COMMON_H_
-#define _COMMON_H_
+#ifndef _COMMON_HH_
+#define _COMMON_HH_
 
-#include <math.h>
-#include <stdbool.h>
+#include <cmath>
+#include <cstdio>
+#include <cstdlib>
+#include <cstring>
 #include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 
-#include "config.h"
+#include "config.hh"
 
 
 /*
@@ -217,7 +216,7 @@ char* mem_strcat(const char* str1, const char* str2)
     size_t size2 = strlen(str2);
     char* str = (char*)mem_alloc(size1 + size2 + 1);
     memcpy(str + size1, str2, size2 + 1);
-    return memcpy(str, str1, size1);
+    return (char*)memcpy(str, str1, size1);
 }
 
 
@@ -269,5 +268,5 @@ void timer_start();
 long timer_stop();
 
 
-#endif // _COMMON_H_
+#endif // _COMMON_HH_