summaryrefslogtreecommitdiffstats
path: root/core/pair.h
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2017-01-02 21:38:20 +0100
committerRémi Verschelde <rverschelde@gmail.com>2017-01-02 21:52:26 +0100
commit3f3f5a5359973e95e94148676a9793d6f52468f3 (patch)
tree65adf17c3d3f8d3a83bec29f51142fe884e942d8 /core/pair.h
parentdb46a344180d4eae1455e97e22bf84c9c304be7c (diff)
parent2820b2d82b2ed747011e37c543aefc6d4d4edee9 (diff)
downloadredot-engine-3f3f5a5359973e95e94148676a9793d6f52468f3.tar.gz
Merge remote-tracking branch 'origin/gles3' into gles3-on-master
Various merge conflicts have been fixed manually and some mistakes might have been made - time will tell :)
Diffstat (limited to 'core/pair.h')
-rw-r--r--core/pair.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/core/pair.h b/core/pair.h
index fe73377fab..d75cbed642 100644
--- a/core/pair.h
+++ b/core/pair.h
@@ -34,6 +34,9 @@ struct Pair {
F first;
S second;
+
+ Pair() {}
+ Pair( F p_first, S p_second) { first=p_first; second=p_second; }
};
#endif // PAIR_H