summaryrefslogtreecommitdiff
path: root/Bus/Ivy/Ivy.h
diff options
context:
space:
mode:
authorfcolin2007-02-01 12:57:25 +0000
committerfcolin2007-02-01 12:57:25 +0000
commit4f7f9bfcf67080eb3e1d7085bb1015200861ed92 (patch)
tree1c56b467f11d781a45926c41a6367fa0d6d9ed49 /Bus/Ivy/Ivy.h
parentcd90995ca02faac49eec142a8af6a9057fb0574e (diff)
downloadivy-cplusplus-4f7f9bfcf67080eb3e1d7085bb1015200861ed92.zip
ivy-cplusplus-4f7f9bfcf67080eb3e1d7085bb1015200861ed92.tar.gz
ivy-cplusplus-4f7f9bfcf67080eb3e1d7085bb1015200861ed92.tar.bz2
ivy-cplusplus-4f7f9bfcf67080eb3e1d7085bb1015200861ed92.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 'Bus/Ivy/Ivy.h')
-rw-r--r--Bus/Ivy/Ivy.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/Bus/Ivy/Ivy.h b/Bus/Ivy/Ivy.h
index 7536f32..38527ea 100644
--- a/Bus/Ivy/Ivy.h
+++ b/Bus/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"