Removed C++17 nested namespace definitions. Should build on trusty again.

2017-11-24 15:49:26 -05:00
parent 4821e103bc
commit c9f2b91daf
129 changed files with 18995 additions and 18592 deletions
@@ -26,28 +26,31 @@
 #include "glbarcode/Barcode2dBase.h"


-namespace glabels::barcode
+namespace glabels
 {
-	namespace QrEncode
+	namespace barcode
 	{
-
-		/**
-		 * QrEncode::QrCode QR Code Barcode
-		 *
-		 * Implements glbarcode::Barcode2dBase.
-		 */
-		class QrCode : public glbarcode::Barcode2dBase
+		namespace QrEncode
 		{
-		public:
-			static Barcode* create();

-		private:
-			bool validate( const std::string& rawData ) override;
+			/**
+			 * QrEncode::QrCode QR Code Barcode
+			 *
+			 * Implements glbarcode::Barcode2dBase.
+			 */
+			class QrCode : public glbarcode::Barcode2dBase
+			{
+			public:
+				static Barcode* create();

-			bool encode( const std::string&       cookedData,
-			             glbarcode::Matrix<bool>& encodedData ) override;
-		};
+			private:
+				bool validate( const std::string& rawData ) override;

+				bool encode( const std::string&       cookedData,
+				             glbarcode::Matrix<bool>& encodedData ) override;
+			};
+
+		}
 	}
 }