summaryrefslogtreecommitdiff
path: root/Ivy/Ivy.h
diff options
context:
space:
mode:
authorfcolin2007-02-01 12:57:25 +0000
committerfcolin2007-02-01 12:57:25 +0000
commit8760f54d8e7bec49438691895c88278480cf236d (patch)
treea98eebcd7efd16ffecc2e57991f98918c3a28d3c /Ivy/Ivy.h
parent1e1ff4438b0ccea93ccf5a746ff6c1fd8a3a4666 (diff)
downloadivy-cplusplus-8760f54d8e7bec49438691895c88278480cf236d.zip
ivy-cplusplus-8760f54d8e7bec49438691895c88278480cf236d.tar.gz
ivy-cplusplus-8760f54d8e7bec49438691895c88278480cf236d.tar.bz2
ivy-cplusplus-8760f54d8e7bec49438691895c88278480cf236d.tar.xz
Utilisateur : Fcolin Date : 18/11/05 Heure : 11:46 Archivé dans $/Bus/Ivy Commentaire: repassage a la STL et correction bug multithread (vss 14)
Diffstat (limited to 'Ivy/Ivy.h')
-rw-r--r--Ivy/Ivy.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/Ivy/Ivy.h b/Ivy/Ivy.h
index 7536f32..38527ea 100644
--- a/Ivy/Ivy.h
+++ b/Ivy/Ivy.h
@@ -22,10 +22,20 @@ class _declspec(dllimport) CBufferedSocket;
#endif
#endif
-#include <windows.h>
+#ifdef IVY_USE_OWN_DATATYPES
#include "DataTypes.h"
+#else
+
+#include <string>
+#include <list>
+#include <vector>
+
+namespace ivy = std;
+
+#endif
+
#include "IvyCallback.h"