geode-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbarr...@apache.org
Subject [45/46] geode-native git commit: GEODE-2741: Fixes inclusion of unmanaged headers.
Date Wed, 17 May 2017 17:50:27 GMT
GEODE-2741: Fixes inclusion of unmanaged headers.


Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/d58a5e30
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/d58a5e30
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/d58a5e30

Branch: refs/heads/develop
Commit: d58a5e30d42ae38fd9a439fe875bb9096cdde386
Parents: 3cb20df
Author: Jacob Barrett <jbarrett@pivotal.io>
Authored: Wed May 17 03:26:35 2017 +0000
Committer: Jacob Barrett <jbarrett@pivotal.io>
Committed: Wed May 17 03:26:35 2017 +0000

----------------------------------------------------------------------
 src/clicache/src/AttributesFactory.cpp          |   2 ++
 src/clicache/src/CqAttributesMutator.cpp        |   3 +--
 src/clicache/src/begin_native.hpp               |  19 +++++++++++++++
 src/clicache/src/end_native.hpp                 |  23 +++++++++++++++++--
 .../src/native_conditional_unique_ptr.hpp       |  19 +++++++++++++++
 src/clicache/src/native_shared_ptr.hpp          |   2 ++
 src/clicache/src/native_unique_ptr.hpp          |  19 +++++++++++++++
 .../test/native_conditional_unqiue_ptrTests.cpp |  19 +++++++++++++++
 src/clicache/test/native_shared_ptrTests.cpp    | Bin 5153 -> 12434 bytes
 src/clicache/test/native_unique_ptrTests.cpp    |  19 +++++++++++++++
 src/tests/cli/QueryHelper/QueryStringsM.cpp     |   8 +++++--
 11 files changed, 127 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/src/AttributesFactory.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/AttributesFactory.cpp b/src/clicache/src/AttributesFactory.cpp
index 90a34b6..33f84ea 100644
--- a/src/clicache/src/AttributesFactory.cpp
+++ b/src/clicache/src/AttributesFactory.cpp
@@ -37,7 +37,9 @@
 #include "impl/SafeConvert.hpp"
 #include "ExceptionTypes.hpp"
 
+#include "begin_native.hpp"
 #include <memory>
+#include "end_native.hpp"
 
 namespace Apache
 {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/src/CqAttributesMutator.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/CqAttributesMutator.cpp b/src/clicache/src/CqAttributesMutator.cpp
index 5184903..e1d9e32 100644
--- a/src/clicache/src/CqAttributesMutator.cpp
+++ b/src/clicache/src/CqAttributesMutator.cpp
@@ -15,9 +15,8 @@
  * limitations under the License.
  */
 
-#include <memory>
-
 #include "begin_native.hpp"
+#include <memory>
 #include <geode/QueryService.hpp>
 #include "end_native.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/src/begin_native.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/begin_native.hpp b/src/clicache/src/begin_native.hpp
index 14d9d47..5ee5877 100644
--- a/src/clicache/src/begin_native.hpp
+++ b/src/clicache/src/begin_native.hpp
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #if defined(__begin_native__hpp__)
 #error Including begin_native.hpp mulitple times without end_native.hpp
 #endif
@@ -20,3 +37,5 @@
 
 // Disable native code generation warning
 #pragma warning(disable: 4793)
+
+#pragma managed(push, off)

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/src/end_native.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/end_native.hpp b/src/clicache/src/end_native.hpp
index 1af8380..8a8a4ae 100644
--- a/src/clicache/src/end_native.hpp
+++ b/src/clicache/src/end_native.hpp
@@ -1,6 +1,25 @@
-#pragma pop_macro("nullptr")
-#pragma pop_macro("_ALLOW_KEYWORD_MACROS")
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma managed(pop)
 
 #pragma warning(pop)
 
+#pragma pop_macro("nullptr")
+#pragma pop_macro("_ALLOW_KEYWORD_MACROS")
+
 #undef __begin_native__hpp__
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/src/native_conditional_unique_ptr.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/native_conditional_unique_ptr.hpp b/src/clicache/src/native_conditional_unique_ptr.hpp
index aff0b47..395fb29 100644
--- a/src/clicache/src/native_conditional_unique_ptr.hpp
+++ b/src/clicache/src/native_conditional_unique_ptr.hpp
@@ -1,6 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #pragma once
 
+#include "begin_native.hpp"
 #include <memory>
+#include "end_native.hpp"
 
 namespace Apache
 {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/src/native_shared_ptr.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/native_shared_ptr.hpp b/src/clicache/src/native_shared_ptr.hpp
index 0e40ff9..ebb0f21 100644
--- a/src/clicache/src/native_shared_ptr.hpp
+++ b/src/clicache/src/native_shared_ptr.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
+#include "begin_native.hpp"
 #include <memory>
+#include "end_native.hpp"
 
 namespace Apache
 {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/src/native_unique_ptr.hpp
----------------------------------------------------------------------
diff --git a/src/clicache/src/native_unique_ptr.hpp b/src/clicache/src/native_unique_ptr.hpp
index bd8ff5f..a14f698 100644
--- a/src/clicache/src/native_unique_ptr.hpp
+++ b/src/clicache/src/native_unique_ptr.hpp
@@ -1,6 +1,25 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #pragma once
 
+#include "begin_native.hpp"
 #include <memory>
+#include "end_native.hpp"
 
 namespace Apache
 {

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/test/native_conditional_unqiue_ptrTests.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/test/native_conditional_unqiue_ptrTests.cpp b/src/clicache/test/native_conditional_unqiue_ptrTests.cpp
index 74cdf34..59fea8d 100644
--- a/src/clicache/test/native_conditional_unqiue_ptrTests.cpp
+++ b/src/clicache/test/native_conditional_unqiue_ptrTests.cpp
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "begin_native.hpp"
 #include <memory>
 #include <functional>
+#include "end_native.hpp"
 #include <native_conditional_unique_ptr.hpp>
 #include "Utils.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/test/native_shared_ptrTests.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/test/native_shared_ptrTests.cpp b/src/clicache/test/native_shared_ptrTests.cpp
index 6cddd97..46bb70d 100644
Binary files a/src/clicache/test/native_shared_ptrTests.cpp and b/src/clicache/test/native_shared_ptrTests.cpp
differ

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/clicache/test/native_unique_ptrTests.cpp
----------------------------------------------------------------------
diff --git a/src/clicache/test/native_unique_ptrTests.cpp b/src/clicache/test/native_unique_ptrTests.cpp
index 393aed5..5ed9e81 100644
--- a/src/clicache/test/native_unique_ptrTests.cpp
+++ b/src/clicache/test/native_unique_ptrTests.cpp
@@ -1,5 +1,24 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include "begin_native.hpp"
 #include <memory>
 #include <functional>
+#include "end_native.hpp"
 #include <native_unique_ptr.hpp>
 #include "Utils.hpp"
 

http://git-wip-us.apache.org/repos/asf/geode-native/blob/d58a5e30/src/tests/cli/QueryHelper/QueryStringsM.cpp
----------------------------------------------------------------------
diff --git a/src/tests/cli/QueryHelper/QueryStringsM.cpp b/src/tests/cli/QueryHelper/QueryStringsM.cpp
index da40374..aab1745 100644
--- a/src/tests/cli/QueryHelper/QueryStringsM.cpp
+++ b/src/tests/cli/QueryHelper/QueryStringsM.cpp
@@ -15,6 +15,10 @@
  * limitations under the License.
  */
 
+#include "begin_native.hpp"
+#include <memory>
+#include "end_native.hpp"
+
 #include "QueryStringsM.hpp"
 #include "impl/ManagedString.hpp"
 
@@ -35,9 +39,9 @@ namespace Apache
         {
           Apache::Geode::Client::ManagedString mg_pquery( pquery );
 
-           auto nativeptr = std::make_unique<testData::QueryStrings>(
+           auto nativeptr = std::unique_ptr<testData::QueryStrings>(new testData::QueryStrings(
             static_cast<testData::queryCategory>( pcategory ),
-            mg_pquery.CharPtr, pisLargeResultset );
+            mg_pquery.CharPtr, pisLargeResultset ));
            m_nativeptr = gcnew native_conditional_unique_ptr<testData::QueryStrings>(std::move(nativeptr));
         }
 


Mime
View raw message