From 58d9f7a84becce54650ae742e5e99471d6ccfc33 Mon Sep 17 00:00:00 2001
From: CHENQ <chennqqi@qq.com>
Date: Sat, 3 Dec 2016 12:41:20 +0800
Subject: [PATCH 1/2] support C++ and add test

---
 .gitignore        |   1 +
 LICENSE           |  40 ++++-----
 README.md         | 218 +++++++++++++++++++++++-----------------------
 package.json      |  18 ++--
 src/map.h         |  24 ++++-
 src/map.o         | Bin 0 -> 9528 bytes
 test/Makefile     |   7 ++
 test/c/Makefile   |  46 ++++++++++
 test/c/main.c     |  17 ++++
 test/cpp/Makefile |  46 ++++++++++
 test/cpp/main.cpp |  16 ++++
 11 files changed, 294 insertions(+), 139 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 src/map.o
 create mode 100644 test/Makefile
 create mode 100644 test/c/Makefile
 create mode 100644 test/c/main.c
 create mode 100644 test/cpp/Makefile
 create mode 100644 test/cpp/main.cpp

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c24ea1b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/test/*.o
diff --git a/LICENSE b/LICENSE
index 03b6555..be79db9 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,20 +1,20 @@
-Copyright (c) 2014 rxi
-
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+Copyright (c) 2014 rxi
+
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index 805b425..4bdf891 100644
--- a/README.md
+++ b/README.md
@@ -1,109 +1,109 @@
-# map
-A type-safe generic hashmap implementation for C.
-
-## Installation 
-The [map.c](src/map.c?raw=1) and [map.h](src/map.h?raw=1) files can be dropped
-into an existing C project and compiled along with it.
-
-
-## Usage
-Before using a map it should first be initialised using the `map_init()`
-function.
-```c
-map_int_t m;
-map_init(&m);
-```
-
-Values can added to a map using the `map_set()` function.
-```c
-map_set(&m, "testkey", 123);
-```
-
-To retrieve a value from a map, the `map_get()` function can be used.
-`map_get()` will return a pointer to the key's value, or `NULL` if no mapping
-for that key exists.
-```c
-int *val = map_get(&m, "testkey");
-if (val) {
-  printf("value: %d\n", *val);
-} else {
-  printf("value not found\n");
-}
-```
-
-When you are done with a map the `map_deinit()` function should be called on
-it. This will free any memory the map allocated during use.
-```c
-map_deinit(&m);
-```
-
-
-## Types
-map.h provides the following predefined map types:
-
-Contained Type  | Type name
-----------------|----------------------------------
-void*           | map_void_t
-char*           | map_str_t
-int             | map_int_t
-char            | map_char_t
-float           | map_float_t
-double          | map_double_t
-
-To define a new map type the `map_t()` macro should be used:
-```c
-/* Creates the type uint_map_t for storing unsigned ints */
-typedef map_t(unsigned int) uint_map_t;
-```
-
-## Functions
-All map functions are macro functions. The parameter `m` in each function
-should be a pointer to the map struct which the operation is to be performed
-on. The `key` parameter should always be a string value.
-
-### map\_t(T)
-Creates a map struct for containing values of type `T`.
-```c
-/* Typedefs the struct `fp_map_t` as a container for type FILE* */
-typedef map_t(FILE*) fp_map_t;
-```
-
-### map\_init(m)
-Initialises the map, this must be called before the map can be used. 
-
-### map\_deinit(m)
-Deinitialises the map, freeing the memory the map allocated during use;
-this should be called when we're finished with a map.
-
-### map\_get(m, key)
-Returns a pointer to the value of the given `key`. If no mapping for the `key`
-exists then `NULL` will be returned.
-
-### map\_set(m, key, value)
-Sets the given `key` to the given `value`. Returns `0` on success, otherwise
-`-1` is returned and the map remains unchanged.
-
-### map\_remove(m, key)
-Removes the mapping of the given `key` from the map. If the `key` does not
-exist in the map then the function has no effect.
-
-### map\_iter(m)
-Returns a `map_iter_t` which can be used with `map_next()` to iterate all the
-keys in the map.
-
-### map\_next(m, iter)
-Uses the `map_iter_t` returned by `map_iter()` to iterate all the keys in the
-map. `map_next()` returns a key with each call and returns `NULL` when there
-are no more keys.
-```c
-const char *key;
-map_iter_t iter = map_iter(&m);
-
-while ((key = map_next(&m, &iter))) {
-  printf("%s -> %d", key, *map_get(&m, key));
-}
-```
-
-## License
-This library is free software; you can redistribute it and/or modify it under
-the terms of the MIT license. See [LICENSE](LICENSE) for details.
+# map
+A type-safe generic hashmap implementation for C.
+
+## Installation 
+The [map.c](src/map.c?raw=1) and [map.h](src/map.h?raw=1) files can be dropped
+into an existing C project and compiled along with it.
+
+
+## Usage
+Before using a map it should first be initialised using the `map_init()`
+function.
+```c
+map_int_t m;
+map_init(&m);
+```
+
+Values can added to a map using the `map_set()` function.
+```c
+map_set(&m, "testkey", 123);
+```
+
+To retrieve a value from a map, the `map_get()` function can be used.
+`map_get()` will return a pointer to the key's value, or `NULL` if no mapping
+for that key exists.
+```c
+int *val = map_get(&m, "testkey");
+if (val) {
+  printf("value: %d\n", *val);
+} else {
+  printf("value not found\n");
+}
+```
+
+When you are done with a map the `map_deinit()` function should be called on
+it. This will free any memory the map allocated during use.
+```c
+map_deinit(&m);
+```
+
+
+## Types
+map.h provides the following predefined map types:
+
+Contained Type  | Type name
+----------------|----------------------------------
+void*           | map_void_t
+char*           | map_str_t
+int             | map_int_t
+char            | map_char_t
+float           | map_float_t
+double          | map_double_t
+
+To define a new map type the `map_t()` macro should be used:
+```c
+/* Creates the type uint_map_t for storing unsigned ints */
+typedef map_t(unsigned int) uint_map_t;
+```
+
+## Functions
+All map functions are macro functions. The parameter `m` in each function
+should be a pointer to the map struct which the operation is to be performed
+on. The `key` parameter should always be a string value.
+
+### map\_t(T)
+Creates a map struct for containing values of type `T`.
+```c
+/* Typedefs the struct `fp_map_t` as a container for type FILE* */
+typedef map_t(FILE*) fp_map_t;
+```
+
+### map\_init(m)
+Initialises the map, this must be called before the map can be used. 
+
+### map\_deinit(m)
+Deinitialises the map, freeing the memory the map allocated during use;
+this should be called when we're finished with a map.
+
+### map\_get(m, key)
+Returns a pointer to the value of the given `key`. If no mapping for the `key`
+exists then `NULL` will be returned.
+
+### map\_set(m, key, value)
+Sets the given `key` to the given `value`. Returns `0` on success, otherwise
+`-1` is returned and the map remains unchanged.
+
+### map\_remove(m, key)
+Removes the mapping of the given `key` from the map. If the `key` does not
+exist in the map then the function has no effect.
+
+### map\_iter(m)
+Returns a `map_iter_t` which can be used with `map_next()` to iterate all the
+keys in the map.
+
+### map\_next(m, iter)
+Uses the `map_iter_t` returned by `map_iter()` to iterate all the keys in the
+map. `map_next()` returns a key with each call and returns `NULL` when there
+are no more keys.
+```c
+const char *key;
+map_iter_t iter = map_iter(&m);
+
+while ((key = map_next(&m, &iter))) {
+  printf("%s -> %d", key, *map_get(&m, key));
+}
+```
+
+## License
+This library is free software; you can redistribute it and/or modify it under
+the terms of the MIT license. See [LICENSE](LICENSE) for details.
diff --git a/package.json b/package.json
index 7b5115b..af8c08a 100644
--- a/package.json
+++ b/package.json
@@ -1,9 +1,9 @@
-{
-  "name": "map",
-  "version": "0.1.0",
-  "repo": "rxi/map",
-  "description": "Type-safe generic hash map",
-  "keywords": ["hashmap", "map", "table", "hashtable", "dict", "dictionary"],
-  "license": "MIT",
-  "src": ["src/map.c", "src/map.h"]
-}
+{
+  "name": "map",
+  "version": "0.1.0",
+  "repo": "rxi/map",
+  "description": "Type-safe generic hash map",
+  "keywords": ["hashmap", "map", "table", "hashtable", "dict", "dictionary"],
+  "license": "MIT",
+  "src": ["src/map.c", "src/map.h"]
+}
diff --git a/src/map.h b/src/map.h
index 71af710..8a01800 100644
--- a/src/map.h
+++ b/src/map.h
@@ -1,4 +1,4 @@
-/** 
+/**
  * Copyright (c) 2014 rxi
  *
  * This library is free software; you can redistribute it and/or modify it
@@ -12,6 +12,8 @@
 
 #define MAP_VERSION "0.1.0"
 
+
+
 struct map_node_t;
 typedef struct map_node_t map_node_t;
 
@@ -58,6 +60,22 @@ typedef struct {
 #define map_next(m, iter)\
   map_next_(&(m)->base, iter)
 
+#ifdef __cplusplus
+extern "C"{
+ #undef map_get
+ #ifdef __clang__
+  #define ___TYPEOF_ __typeof__
+ #elif defined(__GNUC__)
+  #define ___TYPEOF_ typeof
+ #elif defined(_MSC_VER) && _MSC_VER>=1600
+  #define ___TYPEOF_ decltype
+ #else
+  #warning "C++ build need typeof"
+ #endif /*endof clang*/
+ #define map_get(m, key)\
+  ( (m)->ref = (___TYPEOF_((m)->ref)) map_get_(&(m)->base, key) )
+#endif /*endof  __cplusplus*/
+
 
 void map_deinit_(map_base_t *m);
 void *map_get_(map_base_t *m, const char *key);
@@ -74,4 +92,8 @@ typedef map_t(char) map_char_t;
 typedef map_t(float) map_float_t;
 typedef map_t(double) map_double_t;
 
+#ifdef __cplusplus
+}
+#endif
+
 #endif
diff --git a/src/map.o b/src/map.o
new file mode 100644
index 0000000000000000000000000000000000000000..d70e181b7e288af98560a80b49412fdabd526128
GIT binary patch
literal 9528
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
KGwc6vC;kt7$O5VW

literal 0
HcmV?d00001

diff --git a/test/Makefile b/test/Makefile
new file mode 100644
index 0000000..8fb33c3
--- /dev/null
+++ b/test/Makefile
@@ -0,0 +1,7 @@
+all:
+	make -C c
+	make -C cpp
+
+clean:
+	make -C c clean
+	make -C cpp clean
diff --git a/test/c/Makefile b/test/c/Makefile
new file mode 100644
index 0000000..33e6d02
--- /dev/null
+++ b/test/c/Makefile
@@ -0,0 +1,46 @@
+CC = gcc
+CXX = g++
+LINK = g++
+
+CFLAGS_D = $(COMPILER_FLAGS) -c -g -O0 -Wall -Werror
+CFLAGS_R = $(COMPILER_FLAGS) -c -g -O2  -Werror
+CXXFLAGS_D = $(COMPILER_FLAGS) -c -g -O0  -Werror
+CXXFLAGS_R = $(COMPILER_FLAGS) -c -g -O2  -Werror
+
+INC+= -I. -I../../src
+LIBS +=
+RELEASE = 0
+
+TARGET = c_test
+CCFLAGS = $(CFLAGS_R)
+
+ifeq ($(RELEASE),0)
+    # debug
+	CFLAGS = $(CFLAGS_D)
+	CXXFLAGS = $(CXXFLAGS_D)
+else
+    # release
+	CFLAGS = $(CFLAGS_R)
+	CXXFLAGS = $(CXXFLAGS_R)
+endif
+
+
+CFILES = ../../src/map.c  main.c
+
+OBJFILE = $(CFILES:.c=.o) $(CXXFILES:.cpp=.o)
+all:$(TARGET)
+
+
+$(TARGET): $(OBJFILE)
+	$(LINK) $^ $(LIBS) -Wall -o $@
+
+%.o: %.c
+	$(CC) -o $@ $(CCFLAGS) $< $(INC)
+
+%.o: %.cpp
+	 $(CXX) -o $@ $(CXXFLAGS) $< $(INC)
+
+clean:
+	rm -f *.o *~ httpsniff
+	rm -rf $(TARGET)
+	rm -rf $(OBJFILE)
diff --git a/test/c/main.c b/test/c/main.c
new file mode 100644
index 0000000..998b381
--- /dev/null
+++ b/test/c/main.c
@@ -0,0 +1,17 @@
+#include <map.h>
+#include <stdio.h>
+
+int main(void)
+{
+    int *val = NULL;
+	map_int_t m;
+	map_init(&m);
+    map_set(&m, "testkey", 123);
+	val = (int*)(map_get(&m, "testkey"));
+	if (val) {
+	  printf("value: %d\n", *val);
+	} else {
+	  printf("value not found\n");
+	}
+	return 0;
+}
diff --git a/test/cpp/Makefile b/test/cpp/Makefile
new file mode 100644
index 0000000..1a769f2
--- /dev/null
+++ b/test/cpp/Makefile
@@ -0,0 +1,46 @@
+CC = gcc  
+CXX = g++  
+LINK = g++  
+
+CFLAGS_D = $(COMPILER_FLAGS) -c -g -O0 -Wall -Werror 
+CFLAGS_R = $(COMPILER_FLAGS) -c -g -O2  -Werror 
+CXXFLAGS_D = $(COMPILER_FLAGS) -c -g -O0  -Werror 
+CXXFLAGS_R = $(COMPILER_FLAGS) -c -g -O2  -Werror 
+
+INC+= -I. -Iini -I../../src 
+LIBS += 
+RELEASE = 0
+
+TARGET = cpp_test
+CCFLAGS = $(CFLAGS_R)
+
+ifeq ($(RELEASE),0)
+    # debug
+	CFLAGS = $(CFLAGS_D)
+	CXXFLAGS = $(CXXFLAGS_D)
+else
+    # release
+	CFLAGS = $(CFLAGS_R)
+	CXXFLAGS = $(CXXFLAGS_R)
+endif
+
+CXXFILES = main.cpp
+CFILES = ../../src/map.c 
+
+OBJFILE = $(CFILES:.c=.o) $(CXXFILES:.cpp=.o)  
+all:$(TARGET)
+
+
+$(TARGET): $(OBJFILE)  
+	$(LINK) $^ $(LIBS) -Wall -o $@  
+
+%.o: %.c
+	$(CC) -o $@ $(CCFLAGS) $< $(INC)
+	
+%.o: %.cpp
+	 $(CXX) -o $@ $(CXXFLAGS) $< $(INC) 
+
+clean:
+	rm -f *.o *~ httpsniff
+	rm -rf $(TARGET)  
+	rm -rf $(OBJFILE)
diff --git a/test/cpp/main.cpp b/test/cpp/main.cpp
new file mode 100644
index 0000000..39fbdbc
--- /dev/null
+++ b/test/cpp/main.cpp
@@ -0,0 +1,16 @@
+#include <map.h>
+#include <stdio.h>
+
+int main(void)
+{
+	map_int_t m;
+	map_init(&m);
+    map_set(&m, "testkey", 123);
+	int *val = (int*)(map_get(&m, "testkey"));
+	if (val) {
+	  printf("value: %d\n", *val);
+	} else {
+	  printf("value not found\n");
+	}
+	return 0;
+}

From f90e938a4909646327468b119ce2ace1557a25fe Mon Sep 17 00:00:00 2001
From: CHENQ <chennqqi@qq.com>
Date: Mon, 5 Dec 2016 09:34:41 +0800
Subject: [PATCH 2/2] 1. Build Compatible with C++(-Wall -Werror)

	windows _MSC_VER >= 1600(VS2010)

	clang(support but not test)

	gcc(tested gcc>=4.0.0)

2. Add test code
---
 README.md               | 11 +++++++++++
 test/cpp/Makefile.nmake | 17 +++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 test/cpp/Makefile.nmake

diff --git a/README.md b/README.md
index 4bdf891..aae5b5a 100644
--- a/README.md
+++ b/README.md
@@ -104,6 +104,17 @@ while ((key = map_next(&m, &iter))) {
 }
 ```
 
+## Update 2016/12/04
+1. Build Compatible with C++(-Wall -Werror)
+	
+	windows _MSC_VER >= 1600(VS2010)
+
+	clang(support but not test)
+
+	gcc(tested gcc>=4.0.0)
+
+2. Add test code
+
 ## License
 This library is free software; you can redistribute it and/or modify it under
 the terms of the MIT license. See [LICENSE](LICENSE) for details.
diff --git a/test/cpp/Makefile.nmake b/test/cpp/Makefile.nmake
new file mode 100644
index 0000000..f29d9ba
--- /dev/null
+++ b/test/cpp/Makefile.nmake
@@ -0,0 +1,17 @@
+# compile
+map.obj: ../../src/map.c
+    cl -c -DWIN32 -D_DEBUG -D_CONSOLE -I../../src ../../src/map.c
+
+main.obj: main.cpp
+    cl -c -DWIN32 -D_DEBUG -D_CONSOLE -I../../src main.cpp
+
+# link
+cpp_test.exe: main.obj map.obj
+	link /NOLOGO /subsystem:console /out:cpp_test.exe main.obj map.obj kernel32.lib
+ 	
+all: cpp_test.exe
+
+
+clean: 
+	del *.obj  
+	del *.exe     
\ No newline at end of file