From 162964044e73c04d589791d7ae118237a097d769 Mon Sep 17 00:00:00 2001
From: sancar <sancar@hazelcast.com>
Date: Mon, 8 Feb 2016 15:25:10 +0200
Subject: [PATCH] Fix for windows environment. Static initialization moved to
 header

---
 .../pimpl/SerializationConstants.h            | 42 +++++++++----------
 .../pimpl/SerializationConstants.cpp          | 22 ----------
 2 files changed, 21 insertions(+), 43 deletions(-)

diff --git a/hazelcast/include/hazelcast/client/serialization/pimpl/SerializationConstants.h b/hazelcast/include/hazelcast/client/serialization/pimpl/SerializationConstants.h
index 9eab923268..a00647237e 100644
--- a/hazelcast/include/hazelcast/client/serialization/pimpl/SerializationConstants.h
+++ b/hazelcast/include/hazelcast/client/serialization/pimpl/SerializationConstants.h
@@ -41,27 +41,27 @@ namespace hazelcast {
                 public:
                     SerializationConstants();
 
-                    static int const CONSTANT_TYPE_NULL;
-                    static int const CONSTANT_TYPE_PORTABLE;
-                    static int const CONSTANT_TYPE_DATA;
-                    static int const CONSTANT_TYPE_BYTE;
-                    static int const CONSTANT_TYPE_BOOLEAN;
-                    static int const CONSTANT_TYPE_CHAR;
-                    static int const CONSTANT_TYPE_SHORT;
-                    static int const CONSTANT_TYPE_INTEGER;
-                    static int const CONSTANT_TYPE_LONG;
-                    static int const CONSTANT_TYPE_FLOAT;
-                    static int const CONSTANT_TYPE_DOUBLE;
-                    static int const CONSTANT_TYPE_STRING;
-                    static int const CONSTANT_TYPE_BYTE_ARRAY;
-                    static int const CONSTANT_TYPE_BOOLEAN_ARRAY;
-                    static int const CONSTANT_TYPE_CHAR_ARRAY;
-                    static int const CONSTANT_TYPE_SHORT_ARRAY;
-                    static int const CONSTANT_TYPE_INTEGER_ARRAY;
-                    static int const CONSTANT_TYPE_LONG_ARRAY;
-                    static int const CONSTANT_TYPE_FLOAT_ARRAY;
-                    static int const CONSTANT_TYPE_DOUBLE_ARRAY;
-                    static int const CONSTANT_TYPE_STRING_ARRAY;
+                    static int const CONSTANT_TYPE_NULL = 0;
+                    static int const CONSTANT_TYPE_PORTABLE = -1;
+                    static int const CONSTANT_TYPE_DATA = -2;
+                    static int const CONSTANT_TYPE_BYTE = -3;
+                    static int const CONSTANT_TYPE_BOOLEAN = -4;
+                    static int const CONSTANT_TYPE_CHAR = -5;
+                    static int const CONSTANT_TYPE_SHORT = -6;
+                    static int const CONSTANT_TYPE_INTEGER = -7;
+                    static int const CONSTANT_TYPE_LONG = -8;
+                    static int const CONSTANT_TYPE_FLOAT = -9;
+                    static int const CONSTANT_TYPE_DOUBLE = -10;
+                    static int const CONSTANT_TYPE_STRING = -11;
+                    static int const CONSTANT_TYPE_BYTE_ARRAY = -12;
+                    static int const CONSTANT_TYPE_BOOLEAN_ARRAY = -13;
+                    static int const CONSTANT_TYPE_CHAR_ARRAY = -14;
+                    static int const CONSTANT_TYPE_SHORT_ARRAY = -15;
+                    static int const CONSTANT_TYPE_INTEGER_ARRAY = -16;
+                    static int const CONSTANT_TYPE_LONG_ARRAY = -17;
+                    static int const CONSTANT_TYPE_FLOAT_ARRAY = -18;
+                    static int const CONSTANT_TYPE_DOUBLE_ARRAY = -19;
+                    static int const CONSTANT_TYPE_STRING_ARRAY = -20;
 
                     // ------------------------------------------------------------
 
diff --git a/hazelcast/src/hazelcast/client/serialization/pimpl/SerializationConstants.cpp b/hazelcast/src/hazelcast/client/serialization/pimpl/SerializationConstants.cpp
index 580da941e2..3b363d04ac 100644
--- a/hazelcast/src/hazelcast/client/serialization/pimpl/SerializationConstants.cpp
+++ b/hazelcast/src/hazelcast/client/serialization/pimpl/SerializationConstants.cpp
@@ -26,28 +26,6 @@ namespace hazelcast {
     namespace client {
         namespace serialization {
             namespace pimpl {
-                int const SerializationConstants::CONSTANT_TYPE_NULL = 0;
-                int const SerializationConstants::CONSTANT_TYPE_PORTABLE=-1;
-                int const SerializationConstants::CONSTANT_TYPE_DATA=-2;
-                int const SerializationConstants::CONSTANT_TYPE_BYTE=-3;
-                int const SerializationConstants::CONSTANT_TYPE_BOOLEAN=-4;
-                int const SerializationConstants::CONSTANT_TYPE_CHAR=-5;
-                int const SerializationConstants::CONSTANT_TYPE_SHORT=-6;
-                int const SerializationConstants::CONSTANT_TYPE_INTEGER=-7;
-                int const SerializationConstants::CONSTANT_TYPE_LONG=-8;
-                int const SerializationConstants::CONSTANT_TYPE_FLOAT=-9;
-                int const SerializationConstants::CONSTANT_TYPE_DOUBLE=-10;
-                int const SerializationConstants::CONSTANT_TYPE_STRING=-11;
-                int const SerializationConstants::CONSTANT_TYPE_BYTE_ARRAY=-12;
-                int const SerializationConstants::CONSTANT_TYPE_BOOLEAN_ARRAY=-13;
-                int const SerializationConstants::CONSTANT_TYPE_CHAR_ARRAY=-14;
-                int const SerializationConstants::CONSTANT_TYPE_SHORT_ARRAY=-15;
-                int const SerializationConstants::CONSTANT_TYPE_INTEGER_ARRAY=-16;
-                int const SerializationConstants::CONSTANT_TYPE_LONG_ARRAY=-17;
-                int const SerializationConstants::CONSTANT_TYPE_FLOAT_ARRAY=-18;
-                int const SerializationConstants::CONSTANT_TYPE_DOUBLE_ARRAY=-19;
-                int const SerializationConstants::CONSTANT_TYPE_STRING_ARRAY=-20;
-
                 SerializationConstants::SerializationConstants()
                 : size(21)
                 , typeIdNameVector(size){